diff --git a/DOCUMENTATION/DEVELOPERS/Plugins/Sample Plugins/Awesomeness/includes/locale/Awesomeness.pot b/DOCUMENTATION/DEVELOPERS/Plugins/Sample Plugins/Awesomeness/includes/locale/Awesomeness.pot
index 1a73da8f61..a3c3c7d305 100644
--- a/DOCUMENTATION/DEVELOPERS/Plugins/Sample Plugins/Awesomeness/includes/locale/Awesomeness.pot	
+++ b/DOCUMENTATION/DEVELOPERS/Plugins/Sample Plugins/Awesomeness/includes/locale/Awesomeness.pot	
@@ -17,13 +17,8 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-<<<<<<< HEAD
-#. TRANS: Plugin description for a sample plugin.
-#: AwesomenessPlugin.php:55
-=======
 #. TRANS: Module description for a sample plugin.
 #: AwesomenessModule.php:67
->>>>>>> 6b0ad03771... [PLUGINS] Removed GeoURL as the service doesn't exist anymore
 msgid ""
 "The Awesomeness plugin adds additional awesomeness to a GNU social "
 "installation."
diff --git a/plugins/ChooseTheme/locale/ChooseTheme.pot b/plugins/ChooseTheme/locale/ChooseTheme.pot
index 42aee4b34e..1ef9f84aae 100644
--- a/plugins/ChooseTheme/locale/ChooseTheme.pot
+++ b/plugins/ChooseTheme/locale/ChooseTheme.pot
@@ -17,32 +17,17 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-<<<<<<< HEAD
-#. TRANS: Plugin description.
-#: ChooseThemePlugin.php:40
-=======
 #. TRANS: Module description.
 #: ChooseThemeModule.php:44
->>>>>>> 6b0ad03771... [PLUGINS] Removed GeoURL as the service doesn't exist anymore
 msgid "Allowing user to select the preferred theme."
 msgstr ""
 
-#. TRANS: Poll plugin menu item on user settings page.
-<<<<<<< HEAD
-#: ChooseThemePlugin.php:56
-=======
 #: ChooseThemeModule.php:63
->>>>>>> 6b0ad03771... [PLUGINS] Removed GeoURL as the service doesn't exist anymore
 msgctxt "MENU"
 msgid "Theme"
 msgstr ""
 
-#. TRANS: Poll plugin tooltip for user settings menu item.
-<<<<<<< HEAD
-#: ChooseThemePlugin.php:58
-=======
 #: ChooseThemeModule.php:65
->>>>>>> 6b0ad03771... [PLUGINS] Removed GeoURL as the service doesn't exist anymore
 msgid "Choose Theme"
 msgstr ""
 
diff --git a/plugins/ForceGroup/locale/ForceGroup.pot b/plugins/ForceGroup/locale/ForceGroup.pot
index d4d80f24e1..c646c391d9 100644
--- a/plugins/ForceGroup/locale/ForceGroup.pot
+++ b/plugins/ForceGroup/locale/ForceGroup.pot
@@ -17,24 +17,15 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-<<<<<<< HEAD
 #. TRANS: Server exception.
 #. TRANS: %1$s is a user nickname, %2$s is a group nickname.
-#: ForceGroupPlugin.php:94
-=======
 #: ForceGroupModule.php:107
->>>>>>> 6b0ad03771... [PLUGINS] Removed GeoURL as the service doesn't exist anymore
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr ""
 
-<<<<<<< HEAD
-#. TRANS: Plugin description.
-#: ForceGroupPlugin.php:120
-=======
 #. TRANS: Module description.
 #: ForceGroupModule.php:137
->>>>>>> 6b0ad03771... [PLUGINS] Removed GeoURL as the service doesn't exist anymore
 msgid ""
 "Allows forced group memberships and forces all notices to appear in groups "
 "that users were forced in."