diff --git a/webgoat-lessons/chrome-dev-tools/src/main/resources/i18n/WebGoatLabels.properties b/webgoat-lessons/chrome-dev-tools/src/main/resources/i18n/WebGoatLabels.properties
index 0754626c1d..3741c9cf56 100644
--- a/webgoat-lessons/chrome-dev-tools/src/main/resources/i18n/WebGoatLabels.properties
+++ b/webgoat-lessons/chrome-dev-tools/src/main/resources/i18n/WebGoatLabels.properties
@@ -7,10 +7,5 @@ network.request=You made a HTTP Request.
 network.success=Correct, Well Done.
 network.failed=That is not correct, try again.
 
-<<<<<<< HEAD
 networkHint1=Clear all Requests from the network button, then make the request. The you should be able to figure out, which request holds the data.
 networkHint2=The name of the request is "dummy"
-=======
-networkHint1=Clear all Requests from the network tab, then make the request. The you should be able to figure out, which request holds the data.
-networkHint2=The name of the request is "dummy"
->>>>>>> Implemented some feedback