Resolving merge conflicts

19 files changed, 28 insertions, 187 deletions

diff --git a/locale/aln/app.po b/locale/aln/app.po
index 96ccd1863..603379648 100644
--- a/locale/aln/app.po
+++ b/locale/aln/app.po
@@ -3040,15 +3040,7 @@ msgstr ""
 msgid "no later than"
 msgstr ""
 
-<<<<<<< HEAD
-msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
-=======
-msgid ""
-"no longer exists. If you are trying to make\\n    From the request page, try"
-" replying to a particular message, rather than sending\\n    a general "
-"followup. If you need to make a general followup, and know\\n    an email "
-"which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
->>>>>>> 543eb94... Replacing %s with {{}} in translations "From the request page, try replying to a particular message.."
+msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
 msgstr ""
 
 msgid "normally"
diff --git a/locale/ar/app.po b/locale/ar/app.po
index aa9c8f25c..0539597f5 100644
--- a/locale/ar/app.po
+++ b/locale/ar/app.po
@@ -3083,15 +3083,8 @@ msgstr ""
 msgid "no later than"
 msgstr ""
 
-<<<<<<< HEAD
-msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
-=======
-msgid ""
-"no longer exists. If you are trying to make\\n    From the request page, try"
-" replying to a particular message, rather than sending\\n    a general "
-"followup. If you need to make a general followup, and know\\n    an email "
-"which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
->>>>>>> 543eb94... Replacing %s with {{}} in translations "From the request page, try replying to a particular message.."
+msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"{{url}}
+\">send it to us</a>."
 msgstr ""
 
 msgid "normally"
diff --git a/locale/bs/app.po b/locale/bs/app.po
index f2361e492..84b5c73f3 100644
--- a/locale/bs/app.po
+++ b/locale/bs/app.po
@@ -3234,15 +3234,7 @@ msgstr "poruke od korisnika"
 msgid "no later than"
 msgstr "ne kasnije od"
 
-<<<<<<< HEAD
-msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
-=======
-msgid ""
-"no longer exists. If you are trying to make\\n    From the request page, try"
-" replying to a particular message, rather than sending\\n    a general "
-"followup. If you need to make a general followup, and know\\n    an email "
-"which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
->>>>>>> 543eb94... Replacing %s with {{}} in translations "From the request page, try replying to a particular message.."
+msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
 msgstr ""
 
 msgid "normally"
diff --git a/locale/ca/app.po b/locale/ca/app.po
index 2e5c30d27..2e43a1e04 100644
--- a/locale/ca/app.po
+++ b/locale/ca/app.po
@@ -3278,21 +3278,12 @@ msgstr "mensajes de usuarios"
 msgid "no later than"
 msgstr "no más tarde de"
 
-<<<<<<< HEAD
-msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
+msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
 msgstr ""
 "ya no existe. \n"
 "Desde la página de la solicitud, intente responder a un mensaje en concreto, en vez de\n"
 "    responder a la solicitud en general. Si necesita hacerlo y tiene una dirección de\n"
-"    correo válida, por favor <a href=\"%s\">mándenosla</a>."
-=======
-msgid ""
-"no longer exists. If you are trying to make\\n    From the request page, try"
-" replying to a particular message, rather than sending\\n    a general "
-"followup. If you need to make a general followup, and know\\n    an email "
-"which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
-msgstr "ya no existe. \nDesde la página de la solicitud, intente responder a un mensaje en concreto, en vez de\n    responder a la solicitud en general. Si necesita hacerlo y tiene una dirección de\n    correo válida, por favor <a href=\"{{url}}\">mándenosla</a>."
->>>>>>> 543eb94... Replacing %s with {{}} in translations "From the request page, try replying to a particular message.."
+"    correo válida, por favor <a href=\"{{url}}\">mándenosla</a>."
 
 msgid "normally"
 msgstr "normalmente"
diff --git a/locale/cs/app.po b/locale/cs/app.po
index 0960b11a1..1e873ac2e 100644
--- a/locale/cs/app.po
+++ b/locale/cs/app.po
@@ -3248,19 +3248,10 @@ msgstr "zprávy od uživatelů"
 msgid "no later than"
 msgstr "nejpozději do"
 
-<<<<<<< HEAD
-msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
+msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
 msgstr ""
 "již neexistuje. Pokud se pokoušíte\n"
-"    Ze stránky pro vznesení dotazu, pokuste se odpovědět na vybranou zprávu místo podávání obecné odpovědi. Pokud potřebujete poslat obecnou zprávu a znáte správný e-mail, na který to poslat, prosíme <a href=\"%s\">pošlete nám jej</a>."
-=======
-msgid ""
-"no longer exists. If you are trying to make\\n    From the request page, try"
-" replying to a particular message, rather than sending\\n    a general "
-"followup. If you need to make a general followup, and know\\n    an email "
-"which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
-msgstr "již neexistuje. Pokud se pokoušíte\n    Ze stránky pro vznesení dotazu, pokuste se odpovědět na vybranou zprávu místo podávání obecné odpovědi. Pokud potřebujete poslat obecnou zprávu a znáte správný e-mail, na který to poslat, prosíme <a href=\"{{url}}\">pošlete nám jej</a>."
->>>>>>> 543eb94... Replacing %s with {{}} in translations "From the request page, try replying to a particular message.."
+"    Ze stránky pro vznesení dotazu, pokuste se odpovědět na vybranou zprávu místo podávání obecné odpovědi. Pokud potřebujete poslat obecnou zprávu a znáte správný e-mail, na který to poslat, prosíme <a href=\"{{url}}\">pošlete nám jej</a>."
 
 msgid "normally"
 msgstr "to"
diff --git a/locale/cy/app.po b/locale/cy/app.po
index 415ffd3e7..560225b03 100644
--- a/locale/cy/app.po
+++ b/locale/cy/app.po
@@ -3067,15 +3067,7 @@ msgstr ""
 msgid "no later than"
 msgstr ""
 
-<<<<<<< HEAD
-msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
-=======
-msgid ""
-"no longer exists. If you are trying to make\\n    From the request page, try"
-" replying to a particular message, rather than sending\\n    a general "
-"followup. If you need to make a general followup, and know\\n    an email "
-"which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
->>>>>>> 543eb94... Replacing %s with {{}} in translations "From the request page, try replying to a particular message.."
+msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
 msgstr ""
 
 msgid "normally"
diff --git a/locale/en_IE/app.po b/locale/en_IE/app.po
index aa441a38c..eb81bcf6e 100644
--- a/locale/en_IE/app.po
+++ b/locale/en_IE/app.po
@@ -3041,15 +3041,7 @@ msgstr ""
 msgid "no later than"
 msgstr ""
 
-<<<<<<< HEAD
-msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
-=======
-msgid ""
-"no longer exists. If you are trying to make\\n    From the request page, try"
-" replying to a particular message, rather than sending\\n    a general "
-"followup. If you need to make a general followup, and know\\n    an email "
-"which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
->>>>>>> 543eb94... Replacing %s with {{}} in translations "From the request page, try replying to a particular message.."
+msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
 msgstr ""
 
 msgid "normally"
diff --git a/locale/es/app.po b/locale/es/app.po
index afdba9b7d..66178c1d4 100644
--- a/locale/es/app.po
+++ b/locale/es/app.po
@@ -3308,21 +3308,12 @@ msgstr "mensajes de usuarios"
 msgid "no later than"
 msgstr "no más tarde de"
 
-<<<<<<< HEAD
-msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
+msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
 msgstr ""
 "ya no existe. \n"
 "Desde la página de la solicitud, intenta responder a un mensaje en concreto, en vez de\n"
 "    responder a la solicitud en general. Si necesitas hacerlo y tienes una dirección de\n"
-"    correo válida, por favor <a href=\"%s\">mándanosla</a>."
-=======
-msgid ""
-"no longer exists. If you are trying to make\\n    From the request page, try"
-" replying to a particular message, rather than sending\\n    a general "
-"followup. If you need to make a general followup, and know\\n    an email "
-"which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
-msgstr "ya no existe. \nDesde la página de la solicitud, intenta responder a un mensaje en concreto, en vez de\n    responder a la solicitud en general. Si necesitas hacerlo y tienes una dirección de\n    correo válida, por favor <a href=\"{{url}}\">mándanosla</a>."
->>>>>>> 543eb94... Replacing %s with {{}} in translations "From the request page, try replying to a particular message.."
+"    correo válida, por favor <a href=\"{{url}}\">mándanosla</a>."
 
 msgid "normally"
 msgstr "normalmente"
diff --git a/locale/eu/app.po b/locale/eu/app.po
index 729b2d255..8ec151c72 100644
--- a/locale/eu/app.po
+++ b/locale/eu/app.po
@@ -3122,19 +3122,10 @@ msgstr "erabiltzaileen mezuak"
 msgid "no later than"
 msgstr "______ baino beranduago ez"
 
-<<<<<<< HEAD
-msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
+msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
 msgstr ""
 "ez da existitzen. \n"
-"Eskabidearen orrialdetik saia zaitez mezu zehatz bati erantzuten, eskabide osoari orokorrean erantzun baino. Hala egin behar izanez gero eta helbide elektroniko baliagarria baldin baduzu, mesedez <a href=\"%s\">bidal iezaguzu</a>."
-=======
-msgid ""
-"no longer exists. If you are trying to make\\n    From the request page, try"
-" replying to a particular message, rather than sending\\n    a general "
-"followup. If you need to make a general followup, and know\\n    an email "
-"which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
-msgstr "ez da existitzen. \nEskabidearen orrialdetik saia zaitez mezu zehatz bati erantzuten, eskabide osoari orokorrean erantzun baino. Hala egin behar izanez gero eta helbide elektroniko baliagarria baldin baduzu, mesedez <a href=\"{{url}}\">bidal iezaguzu</a>."
->>>>>>> 543eb94... Replacing %s with {{}} in translations "From the request page, try replying to a particular message.."
+"Eskabidearen orrialdetik saia zaitez mezu zehatz bati erantzuten, eskabide osoari orokorrean erantzun baino. Hala egin behar izanez gero eta helbide elektroniko baliagarria baldin baduzu, mesedez <a href=\"{{url}}\">bidal iezaguzu</a>."
 
 msgid "normally"
 msgstr "normalean"
diff --git a/locale/fr/app.po b/locale/fr/app.po
index 5ec6c93bd..2f0dc6054 100644
--- a/locale/fr/app.po
+++ b/locale/fr/app.po
@@ -3051,15 +3051,7 @@ msgstr "messages des utilisateurs"
 msgid "no later than"
 msgstr ""
 
-<<<<<<< HEAD
-msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
-=======
-msgid ""
-"no longer exists. If you are trying to make\\n    From the request page, try"
-" replying to a particular message, rather than sending\\n    a general "
-"followup. If you need to make a general followup, and know\\n    an email "
-"which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
->>>>>>> 543eb94... Replacing %s with {{}} in translations "From the request page, try replying to a particular message.."
+msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
 msgstr ""
 
 msgid "normally"
diff --git a/locale/gl/app.po b/locale/gl/app.po
index 5b20b1384..2317850f6 100644
--- a/locale/gl/app.po
+++ b/locale/gl/app.po
@@ -3279,21 +3279,12 @@ msgstr "mensajes de usuarios"
 msgid "no later than"
 msgstr "no más tarde de"
 
-<<<<<<< HEAD
-msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
+msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
 msgstr ""
 "ya no existe. \n"
 "Desde la página de la solicitud, intente responder a un mensaje en concreto, en vez de\n"
 "    responder a la solicitud en general. Si necesita hacerlo y tiene una dirección de\n"
-"    correo válida, por favor <a href=\"%s\">mándenosla</a>."
-=======
-msgid ""
-"no longer exists. If you are trying to make\\n    From the request page, try"
-" replying to a particular message, rather than sending\\n    a general "
-"followup. If you need to make a general followup, and know\\n    an email "
-"which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
-msgstr "ya no existe. \nDesde la página de la solicitud, intente responder a un mensaje en concreto, en vez de\n    responder a la solicitud en general. Si necesita hacerlo y tiene una dirección de\n    correo válida, por favor <a href=\"{{url}}\">mándenosla</a>."
->>>>>>> 543eb94... Replacing %s with {{}} in translations "From the request page, try replying to a particular message.."
+"    correo válida, por favor <a href=\"{{url}}\">mándenosla</a>."
 
 msgid "normally"
 msgstr "normalmente"
diff --git a/locale/hu_HU/app.po b/locale/hu_HU/app.po
index 33cb75f03..3cf77a102 100644
--- a/locale/hu_HU/app.po
+++ b/locale/hu_HU/app.po
@@ -3273,21 +3273,12 @@ msgstr "felhasználóktól érkező üzenetek "
 msgid "no later than"
 msgstr "nem később, mint "
 
-<<<<<<< HEAD
-msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
+msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
 msgstr ""
 "már nem létezik. Ha \n"
 "   Az igénylési oldalról próbáljon választ adni egy adott üzenetre ahelyett, hogy\n"
 "   általános nyomon követést küldene. Ha általános nyomon követést kíván küldeni, és ismer olyan\n"
-"   e-mail címet, amely a megfelelő helyre kerül, <a href=\"%s\">küldje el nekünk is</a>. "
-=======
-msgid ""
-"no longer exists. If you are trying to make\\n    From the request page, try"
-" replying to a particular message, rather than sending\\n    a general "
-"followup. If you need to make a general followup, and know\\n    an email "
-"which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
-msgstr "már nem létezik. Ha \n   Az igénylési oldalról próbáljon választ adni egy adott üzenetre ahelyett, hogy\n   általános nyomon követést küldene. Ha általános nyomon követést kíván küldeni, és ismer olyan\n   e-mail címet, amely a megfelelő helyre kerül, <a href=\"{{url}}\">küldje el nekünk is</a>. "
->>>>>>> 543eb94... Replacing %s with {{}} in translations "From the request page, try replying to a particular message.."
+"   e-mail címet, amely a megfelelő helyre kerül, <a href=\"{{url}}\">küldje el nekünk is</a>. "
 
 msgid "normally"
 msgstr "normális esetben "
diff --git a/locale/id/app.po b/locale/id/app.po
index de80627f4..b7067edc0 100644
--- a/locale/id/app.po
+++ b/locale/id/app.po
@@ -3293,21 +3293,12 @@ msgstr "pesan dari pengguna"
 msgid "no later than"
 msgstr "tidak kurang dari"
 
-<<<<<<< HEAD
-msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
+msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
 msgstr ""
 "tidak lagi ada. Jika Anda mencoba untuk membuat\n"
 "    Dari halaman permintaan, coba untuk membalas ke pesan tertentu, daripada mengirim\n"
 "    tindak lanjut umum. Jika Anda perlu membuat tindak lanjut umum, dan tahu\n"
-"    email yang akan pergi ke tempat yang tepat, silakan <a href=\"%s\">mengirimkannya kepada kami</a>."
-=======
-msgid ""
-"no longer exists. If you are trying to make\\n    From the request page, try"
-" replying to a particular message, rather than sending\\n    a general "
-"followup. If you need to make a general followup, and know\\n    an email "
-"which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
-msgstr "tidak lagi ada. Jika Anda mencoba untuk membuat\n    Dari halaman permintaan, coba untuk membalas ke pesan tertentu, daripada mengirim\n    tindak lanjut umum. Jika Anda perlu membuat tindak lanjut umum, dan tahu\n    email yang akan pergi ke tempat yang tepat, silakan <a href=\"{{url}}\">mengirimkannya kepada kami</a>."
->>>>>>> 543eb94... Replacing %s with {{}} in translations "From the request page, try replying to a particular message.."
+"    email yang akan pergi ke tempat yang tepat, silakan <a href=\"{{url}}\">mengirimkannya kepada kami</a>."
 
 msgid "normally"
 msgstr "biasanya"
diff --git a/locale/pt_BR/app.po b/locale/pt_BR/app.po
index 2f6782330..1fb91bcce 100644
--- a/locale/pt_BR/app.po
+++ b/locale/pt_BR/app.po
@@ -3107,15 +3107,7 @@ msgstr "mensagens de usuários"
 msgid "no later than"
 msgstr "até o dia"
 
-<<<<<<< HEAD
-msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
-=======
-msgid ""
-"no longer exists. If you are trying to make\\n    From the request page, try"
-" replying to a particular message, rather than sending\\n    a general "
-"followup. If you need to make a general followup, and know\\n    an email "
-"which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
->>>>>>> 543eb94... Replacing %s with {{}} in translations "From the request page, try replying to a particular message.."
+msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
 msgstr ""
 
 msgid "normally"
diff --git a/locale/ro_RO/app.po b/locale/ro_RO/app.po
index 381ea7bd6..78744673a 100644
--- a/locale/ro_RO/app.po
+++ b/locale/ro_RO/app.po
@@ -3052,15 +3052,7 @@ msgstr ""
 msgid "no later than"
 msgstr ""
 
-<<<<<<< HEAD
-msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
-=======
-msgid ""
-"no longer exists. If you are trying to make\\n    From the request page, try"
-" replying to a particular message, rather than sending\\n    a general "
-"followup. If you need to make a general followup, and know\\n    an email "
-"which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
->>>>>>> 543eb94... Replacing %s with {{}} in translations "From the request page, try replying to a particular message.."
+msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
 msgstr ""
 
 msgid "normally"
diff --git a/locale/sq/app.po b/locale/sq/app.po
index 28505c9d9..09853e92e 100644
--- a/locale/sq/app.po
+++ b/locale/sq/app.po
@@ -3205,19 +3205,10 @@ msgstr "mesazhe nga përdoruesit"
 msgid "no later than"
 msgstr "jo më vonë se"
 
-<<<<<<< HEAD
-msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
+msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
 msgstr ""
 "nuk ekziston më. Nëse je duke u përpjekur për të bërë\n"
-"    Prej faqes së kërkesës, provo ti përgjigjesh një mesazhi të veçant, në vend se të dërgosh një mesazh vazhdues. Nëse keni nevojë të bëni një mesazh prëcjellës të përgjithshëm dhe e di një adresë të emailit që do të shkon ne vendin e duhur, të lutem <a href=\"%s\">na e dërgo</a>."
-=======
-msgid ""
-"no longer exists. If you are trying to make\\n    From the request page, try"
-" replying to a particular message, rather than sending\\n    a general "
-"followup. If you need to make a general followup, and know\\n    an email "
-"which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
-msgstr "nuk ekziston më. Nëse je duke u përpjekur për të bërë\n    Prej faqes së kërkesës, provo ti përgjigjesh një mesazhi të veçant, në vend se të dërgosh një mesazh vazhdues. Nëse keni nevojë të bëni një mesazh prëcjellës të përgjithshëm dhe e di një adresë të emailit që do të shkon ne vendin e duhur, të lutem <a href=\"{{url}}\">na e dërgo</a>."
->>>>>>> 543eb94... Replacing %s with {{}} in translations "From the request page, try replying to a particular message.."
+"    Prej faqes së kërkesës, provo ti përgjigjesh një mesazhi të veçant, në vend se të dërgosh një mesazh vazhdues. Nëse keni nevojë të bëni një mesazh prëcjellës të përgjithshëm dhe e di një adresë të emailit që do të shkon ne vendin e duhur, të lutem <a href=\"{{url}}\">na e dërgo</a>."
 
 msgid "normally"
 msgstr "normalisht"
diff --git a/locale/sr@latin/app.po b/locale/sr@latin/app.po
index 6afcd9472..cd4e5678b 100644
--- a/locale/sr@latin/app.po
+++ b/locale/sr@latin/app.po
@@ -3233,15 +3233,7 @@ msgstr "poruke od korisnika"
 msgid "no later than"
 msgstr "ne kasnije od"
 
-<<<<<<< HEAD
-msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
-=======
-msgid ""
-"no longer exists. If you are trying to make\\n    From the request page, try"
-" replying to a particular message, rather than sending\\n    a general "
-"followup. If you need to make a general followup, and know\\n    an email "
-"which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
->>>>>>> 543eb94... Replacing %s with {{}} in translations "From the request page, try replying to a particular message.."
+msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
 msgstr ""
 
 msgid "normally"
diff --git a/locale/tr/app.po b/locale/tr/app.po
index e3211a056..ca04101a9 100644
--- a/locale/tr/app.po
+++ b/locale/tr/app.po
@@ -3029,15 +3029,7 @@ msgstr ""
 msgid "no later than"
 msgstr ""
 
-<<<<<<< HEAD
-msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
-=======
-msgid ""
-"no longer exists. If you are trying to make\\n    From the request page, try"
-" replying to a particular message, rather than sending\\n    a general "
-"followup. If you need to make a general followup, and know\\n    an email "
-"which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
->>>>>>> 543eb94... Replacing %s with {{}} in translations "From the request page, try replying to a particular message.."
+msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
 msgstr ""
 
 msgid "normally"
diff --git a/locale/uk/app.po b/locale/uk/app.po
index 535da4180..76ab024a3 100644
--- a/locale/uk/app.po
+++ b/locale/uk/app.po
@@ -3203,15 +3203,7 @@ msgstr "повідомлення від користувачів"
 msgid "no later than"
 msgstr "не пізніше, ніж"
 
-<<<<<<< HEAD
-msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
-=======
-msgid ""
-"no longer exists. If you are trying to make\\n    From the request page, try"
-" replying to a particular message, rather than sending\\n    a general "
-"followup. If you need to make a general followup, and know\\n    an email "
-"which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
->>>>>>> 543eb94... Replacing %s with {{}} in translations "From the request page, try replying to a particular message.."
+msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
 msgstr ""
 
 msgid "normally"