diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 9062d3d5c..79d811f78 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -43,11 +43,7 @@
     "close":"Close",
     "edit": "Edit",
     "save": "save",
-<<<<<<< HEAD
     "recipient":"Recipient",
-=======
-    "receiver":"Recipient",
->>>>>>> 86e253ac0495b36b1ce3a07eeb9d35dae9abced2
     "sender":"Sender",
     "username":"Username",
     "firstname":"Firstname",