diff --git a/messages/en-US.json b/messages/en-US.json
index 0e2773c2..1efdb3a1 100644
--- a/messages/en-US.json
+++ b/messages/en-US.json
@@ -2153,14 +2153,9 @@
     "selectedResources": "Selected Resources",
     "enableSelected": "Enable Selected",
     "disableSelected": "Disable Selected",
-<<<<<<< HEAD
     "checkSelectedStatus": "Check Status of Selected",
     "clients": "Clients",
     "accessClientSelect": "Select machine clients",
     "resourceClientDescription": "Machine clients that can access this resource",
     "regenerate": "Regenerate"
 }
-=======
-    "checkSelectedStatus": "Check Status of Selected"
-}
->>>>>>> dev