Resolve merge conflicts

Author: Jakub Drozdek

5-network/01-fetch/article.md

@@ -89,11 +89,7 @@ fetch('https://api.github.com/repos/javascript-tutorial/en.javascript.info/commi
   .then(commits => alert(commits[0].author.login));
 ```
 
-<<<<<<< HEAD
 Aby pobrać odpowiedź jako tekst, użyj `await response.text()` zamiast `.json()`:
-=======
-To get the response text, `await response.text()` instead of `.json()`:
->>>>>>> 70ca842bef2390bc26d13dea2b856838aa890fe0
 
 ```js run async
 let response = await fetch('https://api.github.com/repos/javascript-tutorial/en.javascript.info/commits');