diff --git a/configure b/configure
index db3df27b..e08f7148 100755
--- a/configure
+++ b/configure
@@ -27,6 +27,7 @@ exec echo "Either install python, or use cmake directly"
 
 import argparse
 import os
+import shutil
 import subprocess
 import sys
 import re
@@ -117,6 +118,11 @@ parser.add_argument('env', nargs='*', type=env_type, metavar='ENV_VAR=VALUE')
 
 args = parser.parse_args()
 
+if not shutil.which('cmake'):
+    print('CMake is required to proceed. Please install it via package manager,\n'
+          'or download the binary from https://cmake.org/')
+    sys.exit(1)
+
 cm_args = args.cm_args or []
 
 for env_key, env_value in args.env:
diff --git a/modules/po/admindebug.id_ID.po b/modules/po/admindebug.id_ID.po
index dda9bdd7..5392229e 100644
--- a/modules/po/admindebug.id_ID.po
+++ b/modules/po/admindebug.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/admindebug.pot\n"
 "X-Crowdin-File-ID: 273\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/admindebug.pot\n"
+"X-Crowdin-File-ID: 426\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/adminlog.id_ID.po b/modules/po/adminlog.id_ID.po
index f45e1e64..0816846b 100644
--- a/modules/po/adminlog.id_ID.po
+++ b/modules/po/adminlog.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/adminlog.pot\n"
 "X-Crowdin-File-ID: 149\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/adminlog.pot\n"
+"X-Crowdin-File-ID: 430\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/alias.id_ID.po b/modules/po/alias.id_ID.po
index 0dbcc95a..ddc31e0b 100644
--- a/modules/po/alias.id_ID.po
+++ b/modules/po/alias.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/alias.pot\n"
 "X-Crowdin-File-ID: 150\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/alias.pot\n"
+"X-Crowdin-File-ID: 428\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/autoattach.id_ID.po b/modules/po/autoattach.id_ID.po
index a452dc40..102c63b9 100644
--- a/modules/po/autoattach.id_ID.po
+++ b/modules/po/autoattach.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/autoattach.pot\n"
 "X-Crowdin-File-ID: 151\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/autoattach.pot\n"
+"X-Crowdin-File-ID: 434\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/autocycle.id_ID.po b/modules/po/autocycle.id_ID.po
index 2fbab50e..8e5f4b29 100644
--- a/modules/po/autocycle.id_ID.po
+++ b/modules/po/autocycle.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/autocycle.pot\n"
 "X-Crowdin-File-ID: 207\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/autocycle.pot\n"
+"X-Crowdin-File-ID: 436\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/autoop.id_ID.po b/modules/po/autoop.id_ID.po
index f709233b..4a2f87b2 100644
--- a/modules/po/autoop.id_ID.po
+++ b/modules/po/autoop.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/autoop.pot\n"
 "X-Crowdin-File-ID: 153\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/autoop.pot\n"
+"X-Crowdin-File-ID: 432\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/autoreply.id_ID.po b/modules/po/autoreply.id_ID.po
index 399a9ff8..c14d45ad 100644
--- a/modules/po/autoreply.id_ID.po
+++ b/modules/po/autoreply.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/autoreply.pot\n"
 "X-Crowdin-File-ID: 154\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/autoreply.pot\n"
+"X-Crowdin-File-ID: 438\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/autovoice.id_ID.po b/modules/po/autovoice.id_ID.po
index 3bb5e6b9..0f79144e 100644
--- a/modules/po/autovoice.id_ID.po
+++ b/modules/po/autovoice.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/autovoice.pot\n"
 "X-Crowdin-File-ID: 155\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/autovoice.pot\n"
+"X-Crowdin-File-ID: 442\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/awaystore.id_ID.po b/modules/po/awaystore.id_ID.po
index fe046126..06813279 100644
--- a/modules/po/awaystore.id_ID.po
+++ b/modules/po/awaystore.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/awaystore.pot\n"
 "X-Crowdin-File-ID: 156\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/awaystore.pot\n"
+"X-Crowdin-File-ID: 444\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/block_motd.id_ID.po b/modules/po/block_motd.id_ID.po
index b21f4019..eb5a2ce2 100644
--- a/modules/po/block_motd.id_ID.po
+++ b/modules/po/block_motd.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/block_motd.pot\n"
 "X-Crowdin-File-ID: 157\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/block_motd.pot\n"
+"X-Crowdin-File-ID: 446\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/blockuser.id_ID.po b/modules/po/blockuser.id_ID.po
index c95ed576..d74f8c68 100644
--- a/modules/po/blockuser.id_ID.po
+++ b/modules/po/blockuser.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/blockuser.pot\n"
 "X-Crowdin-File-ID: 158\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/blockuser.pot\n"
+"X-Crowdin-File-ID: 448\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/bouncedcc.id_ID.po b/modules/po/bouncedcc.id_ID.po
index 154af713..bb0642ce 100644
--- a/modules/po/bouncedcc.id_ID.po
+++ b/modules/po/bouncedcc.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/bouncedcc.pot\n"
 "X-Crowdin-File-ID: 159\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/bouncedcc.pot\n"
+"X-Crowdin-File-ID: 450\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/buffextras.id_ID.po b/modules/po/buffextras.id_ID.po
index 01ee6ebb..ff84eaff 100644
--- a/modules/po/buffextras.id_ID.po
+++ b/modules/po/buffextras.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/buffextras.pot\n"
 "X-Crowdin-File-ID: 160\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/buffextras.pot\n"
+"X-Crowdin-File-ID: 452\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/cert.id_ID.po b/modules/po/cert.id_ID.po
index b7df124e..853d3b22 100644
--- a/modules/po/cert.id_ID.po
+++ b/modules/po/cert.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/cert.pot\n"
 "X-Crowdin-File-ID: 161\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/cert.pot\n"
+"X-Crowdin-File-ID: 440\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/certauth.id_ID.po b/modules/po/certauth.id_ID.po
index c4c2be0d..0d647bd0 100644
--- a/modules/po/certauth.id_ID.po
+++ b/modules/po/certauth.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/certauth.pot\n"
 "X-Crowdin-File-ID: 162\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/certauth.pot\n"
+"X-Crowdin-File-ID: 454\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/chansaver.id_ID.po b/modules/po/chansaver.id_ID.po
index a6fb3442..4e754de3 100644
--- a/modules/po/chansaver.id_ID.po
+++ b/modules/po/chansaver.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/chansaver.pot\n"
 "X-Crowdin-File-ID: 163\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/chansaver.pot\n"
+"X-Crowdin-File-ID: 458\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/clearbufferonmsg.id_ID.po b/modules/po/clearbufferonmsg.id_ID.po
index 7eba1c60..0fe97ac4 100644
--- a/modules/po/clearbufferonmsg.id_ID.po
+++ b/modules/po/clearbufferonmsg.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/clearbufferonmsg.pot\n"
 "X-Crowdin-File-ID: 164\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/clearbufferonmsg.pot\n"
+"X-Crowdin-File-ID: 462\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/clientnotify.id_ID.po b/modules/po/clientnotify.id_ID.po
index d2c9ae1b..81ae2217 100644
--- a/modules/po/clientnotify.id_ID.po
+++ b/modules/po/clientnotify.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/clientnotify.pot\n"
 "X-Crowdin-File-ID: 165\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/clientnotify.pot\n"
+"X-Crowdin-File-ID: 464\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/controlpanel.id_ID.po b/modules/po/controlpanel.id_ID.po
index 1a72d408..a3acb197 100644
--- a/modules/po/controlpanel.id_ID.po
+++ b/modules/po/controlpanel.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/controlpanel.pot\n"
 "X-Crowdin-File-ID: 166\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/controlpanel.pot\n"
+"X-Crowdin-File-ID: 466\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/corecaps.id_ID.po b/modules/po/corecaps.id_ID.po
index abe81e3a..c8f057e8 100644
--- a/modules/po/corecaps.id_ID.po
+++ b/modules/po/corecaps.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/corecaps.pot\n"
 "X-Crowdin-File-ID: 412\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/corecaps.pot\n"
+"X-Crowdin-File-ID: 460\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/crypt.id_ID.po b/modules/po/crypt.id_ID.po
index cb021a7f..04fbcbea 100644
--- a/modules/po/crypt.id_ID.po
+++ b/modules/po/crypt.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/crypt.pot\n"
 "X-Crowdin-File-ID: 167\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/crypt.pot\n"
+"X-Crowdin-File-ID: 468\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/ctcpflood.id_ID.po b/modules/po/ctcpflood.id_ID.po
index 40a9cdd0..733a9e8c 100644
--- a/modules/po/ctcpflood.id_ID.po
+++ b/modules/po/ctcpflood.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/ctcpflood.pot\n"
 "X-Crowdin-File-ID: 168\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/ctcpflood.pot\n"
+"X-Crowdin-File-ID: 470\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/cyrusauth.id_ID.po b/modules/po/cyrusauth.id_ID.po
index e6820030..2e803df9 100644
--- a/modules/po/cyrusauth.id_ID.po
+++ b/modules/po/cyrusauth.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/cyrusauth.pot\n"
 "X-Crowdin-File-ID: 169\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/cyrusauth.pot\n"
+"X-Crowdin-File-ID: 472\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/dcc.id_ID.po b/modules/po/dcc.id_ID.po
index f1af517b..9bca6bc0 100644
--- a/modules/po/dcc.id_ID.po
+++ b/modules/po/dcc.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/dcc.pot\n"
 "X-Crowdin-File-ID: 170\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/dcc.pot\n"
+"X-Crowdin-File-ID: 456\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/disconkick.id_ID.po b/modules/po/disconkick.id_ID.po
index 8d72561a..264e48ff 100644
--- a/modules/po/disconkick.id_ID.po
+++ b/modules/po/disconkick.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/disconkick.pot\n"
 "X-Crowdin-File-ID: 171\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/disconkick.pot\n"
+"X-Crowdin-File-ID: 476\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/fail2ban.id_ID.po b/modules/po/fail2ban.id_ID.po
index 3ab23216..bac60d02 100644
--- a/modules/po/fail2ban.id_ID.po
+++ b/modules/po/fail2ban.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/fail2ban.pot\n"
 "X-Crowdin-File-ID: 172\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/fail2ban.pot\n"
+"X-Crowdin-File-ID: 478\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/flooddetach.id_ID.po b/modules/po/flooddetach.id_ID.po
index bfdb04de..2f9d739a 100644
--- a/modules/po/flooddetach.id_ID.po
+++ b/modules/po/flooddetach.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/flooddetach.pot\n"
 "X-Crowdin-File-ID: 173\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/flooddetach.pot\n"
+"X-Crowdin-File-ID: 480\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/identfile.id_ID.po b/modules/po/identfile.id_ID.po
index 31f09ade..77ff3a5a 100644
--- a/modules/po/identfile.id_ID.po
+++ b/modules/po/identfile.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/identfile.pot\n"
 "X-Crowdin-File-ID: 174\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/identfile.pot\n"
+"X-Crowdin-File-ID: 484\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/imapauth.id_ID.po b/modules/po/imapauth.id_ID.po
index 8ecd94d2..747d7934 100644
--- a/modules/po/imapauth.id_ID.po
+++ b/modules/po/imapauth.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/imapauth.pot\n"
 "X-Crowdin-File-ID: 175\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/imapauth.pot\n"
+"X-Crowdin-File-ID: 486\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/keepnick.id_ID.po b/modules/po/keepnick.id_ID.po
index c0ae6d60..38150d81 100644
--- a/modules/po/keepnick.id_ID.po
+++ b/modules/po/keepnick.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/keepnick.pot\n"
 "X-Crowdin-File-ID: 176\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/keepnick.pot\n"
+"X-Crowdin-File-ID: 488\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/kickrejoin.id_ID.po b/modules/po/kickrejoin.id_ID.po
index 40d07ebb..6b2af1ea 100644
--- a/modules/po/kickrejoin.id_ID.po
+++ b/modules/po/kickrejoin.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/kickrejoin.pot\n"
 "X-Crowdin-File-ID: 177\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/kickrejoin.pot\n"
+"X-Crowdin-File-ID: 490\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/lastseen.id_ID.po b/modules/po/lastseen.id_ID.po
index 5a5c1e9e..98bb368a 100644
--- a/modules/po/lastseen.id_ID.po
+++ b/modules/po/lastseen.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/lastseen.pot\n"
 "X-Crowdin-File-ID: 178\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/lastseen.pot\n"
+"X-Crowdin-File-ID: 492\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/listsockets.id_ID.po b/modules/po/listsockets.id_ID.po
index 993f9b3d..d0342598 100644
--- a/modules/po/listsockets.id_ID.po
+++ b/modules/po/listsockets.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/listsockets.pot\n"
 "X-Crowdin-File-ID: 179\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/listsockets.pot\n"
+"X-Crowdin-File-ID: 494\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/log.id_ID.po b/modules/po/log.id_ID.po
index 248ca76a..2ce1d0ea 100644
--- a/modules/po/log.id_ID.po
+++ b/modules/po/log.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/log.pot\n"
 "X-Crowdin-File-ID: 180\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/log.pot\n"
+"X-Crowdin-File-ID: 474\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/missingmotd.id_ID.po b/modules/po/missingmotd.id_ID.po
index cd3bb1fe..df3dca45 100644
--- a/modules/po/missingmotd.id_ID.po
+++ b/modules/po/missingmotd.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/missingmotd.pot\n"
 "X-Crowdin-File-ID: 181\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/missingmotd.pot\n"
+"X-Crowdin-File-ID: 496\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/modperl.id_ID.po b/modules/po/modperl.id_ID.po
index 832f503b..52b0fb64 100644
--- a/modules/po/modperl.id_ID.po
+++ b/modules/po/modperl.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/modperl.pot\n"
 "X-Crowdin-File-ID: 182\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/modperl.pot\n"
+"X-Crowdin-File-ID: 498\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/modpython.id_ID.po b/modules/po/modpython.id_ID.po
index cff3f223..edca7ba1 100644
--- a/modules/po/modpython.id_ID.po
+++ b/modules/po/modpython.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/modpython.pot\n"
 "X-Crowdin-File-ID: 183\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/modpython.pot\n"
+"X-Crowdin-File-ID: 500\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/modules_online.id_ID.po b/modules/po/modules_online.id_ID.po
index 64457a02..b7d407e8 100644
--- a/modules/po/modules_online.id_ID.po
+++ b/modules/po/modules_online.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/modules_online.pot\n"
 "X-Crowdin-File-ID: 184\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/modules_online.pot\n"
+"X-Crowdin-File-ID: 502\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/nickserv.id_ID.po b/modules/po/nickserv.id_ID.po
index 3cee07a4..6f1b1d74 100644
--- a/modules/po/nickserv.id_ID.po
+++ b/modules/po/nickserv.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/nickserv.pot\n"
 "X-Crowdin-File-ID: 185\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/nickserv.pot\n"
+"X-Crowdin-File-ID: 504\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/notes.id_ID.po b/modules/po/notes.id_ID.po
index 98850154..fc7a7912 100644
--- a/modules/po/notes.id_ID.po
+++ b/modules/po/notes.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/notes.pot\n"
 "X-Crowdin-File-ID: 186\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/notes.pot\n"
+"X-Crowdin-File-ID: 506\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/notify_connect.id_ID.po b/modules/po/notify_connect.id_ID.po
index 2f970b02..cf586686 100644
--- a/modules/po/notify_connect.id_ID.po
+++ b/modules/po/notify_connect.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/notify_connect.pot\n"
 "X-Crowdin-File-ID: 187\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/notify_connect.pot\n"
+"X-Crowdin-File-ID: 508\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/perform.id_ID.po b/modules/po/perform.id_ID.po
index 87f32225..9d6fc68d 100644
--- a/modules/po/perform.id_ID.po
+++ b/modules/po/perform.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/perform.pot\n"
 "X-Crowdin-File-ID: 189\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/perform.pot\n"
+"X-Crowdin-File-ID: 510\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/perleval.id_ID.po b/modules/po/perleval.id_ID.po
index 358a8a9a..2e50c660 100644
--- a/modules/po/perleval.id_ID.po
+++ b/modules/po/perleval.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/perleval.pot\n"
 "X-Crowdin-File-ID: 190\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/perleval.pot\n"
+"X-Crowdin-File-ID: 512\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/pyeval.id_ID.po b/modules/po/pyeval.id_ID.po
index 6ff56b0b..5f5526ce 100644
--- a/modules/po/pyeval.id_ID.po
+++ b/modules/po/pyeval.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/pyeval.pot\n"
 "X-Crowdin-File-ID: 191\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/pyeval.pot\n"
+"X-Crowdin-File-ID: 514\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/raw.id_ID.po b/modules/po/raw.id_ID.po
index 9ac7ab78..4d67b0f6 100644
--- a/modules/po/raw.id_ID.po
+++ b/modules/po/raw.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/raw.pot\n"
 "X-Crowdin-File-ID: 193\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/raw.pot\n"
+"X-Crowdin-File-ID: 482\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/route_replies.id_ID.po b/modules/po/route_replies.id_ID.po
index 760644c0..59abeed6 100644
--- a/modules/po/route_replies.id_ID.po
+++ b/modules/po/route_replies.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/route_replies.pot\n"
 "X-Crowdin-File-ID: 194\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/route_replies.pot\n"
+"X-Crowdin-File-ID: 516\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/sample.id_ID.po b/modules/po/sample.id_ID.po
index 17032ef6..69180019 100644
--- a/modules/po/sample.id_ID.po
+++ b/modules/po/sample.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/sample.pot\n"
 "X-Crowdin-File-ID: 195\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/sample.pot\n"
+"X-Crowdin-File-ID: 518\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/samplewebapi.id_ID.po b/modules/po/samplewebapi.id_ID.po
index 449e0f48..89a2a055 100644
--- a/modules/po/samplewebapi.id_ID.po
+++ b/modules/po/samplewebapi.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/samplewebapi.pot\n"
 "X-Crowdin-File-ID: 196\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/samplewebapi.pot\n"
+"X-Crowdin-File-ID: 520\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/sasl.id_ID.po b/modules/po/sasl.id_ID.po
index 8d8fd39e..4ded3502 100644
--- a/modules/po/sasl.id_ID.po
+++ b/modules/po/sasl.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/sasl.pot\n"
 "X-Crowdin-File-ID: 197\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/sasl.pot\n"
+"X-Crowdin-File-ID: 522\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/savebuff.id_ID.po b/modules/po/savebuff.id_ID.po
index d3e8b522..b28331ba 100644
--- a/modules/po/savebuff.id_ID.po
+++ b/modules/po/savebuff.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/savebuff.pot\n"
 "X-Crowdin-File-ID: 198\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/savebuff.pot\n"
+"X-Crowdin-File-ID: 524\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/send_raw.id_ID.po b/modules/po/send_raw.id_ID.po
index aa609e5a..30a79f94 100644
--- a/modules/po/send_raw.id_ID.po
+++ b/modules/po/send_raw.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/send_raw.pot\n"
 "X-Crowdin-File-ID: 199\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/send_raw.pot\n"
+"X-Crowdin-File-ID: 526\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/shell.id_ID.po b/modules/po/shell.id_ID.po
index 93518d04..89f73b80 100644
--- a/modules/po/shell.id_ID.po
+++ b/modules/po/shell.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/shell.pot\n"
 "X-Crowdin-File-ID: 200\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/shell.pot\n"
+"X-Crowdin-File-ID: 528\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/simple_away.id_ID.po b/modules/po/simple_away.id_ID.po
index 3aee727d..a01e3994 100644
--- a/modules/po/simple_away.id_ID.po
+++ b/modules/po/simple_away.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/simple_away.pot\n"
 "X-Crowdin-File-ID: 201\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/simple_away.pot\n"
+"X-Crowdin-File-ID: 530\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/stickychan.id_ID.po b/modules/po/stickychan.id_ID.po
index 689bd71e..6ae98cfb 100644
--- a/modules/po/stickychan.id_ID.po
+++ b/modules/po/stickychan.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/stickychan.pot\n"
 "X-Crowdin-File-ID: 202\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/stickychan.pot\n"
+"X-Crowdin-File-ID: 532\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/stripcontrols.id_ID.po b/modules/po/stripcontrols.id_ID.po
index 8904b06c..bf087fb3 100644
--- a/modules/po/stripcontrols.id_ID.po
+++ b/modules/po/stripcontrols.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/stripcontrols.pot\n"
 "X-Crowdin-File-ID: 203\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/stripcontrols.pot\n"
+"X-Crowdin-File-ID: 534\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/watch.id_ID.po b/modules/po/watch.id_ID.po
index 95e188dd..6ba54c7b 100644
--- a/modules/po/watch.id_ID.po
+++ b/modules/po/watch.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/watch.pot\n"
 "X-Crowdin-File-ID: 204\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/watch.pot\n"
+"X-Crowdin-File-ID: 536\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/modules/po/webadmin.id_ID.po b/modules/po/webadmin.id_ID.po
index fb4d32b9..38c11270 100644
--- a/modules/po/webadmin.id_ID.po
+++ b/modules/po/webadmin.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/modules/po/webadmin.pot\n"
 "X-Crowdin-File-ID: 205\n"
+=======
+"X-Crowdin-File: /1.9.x/modules/po/webadmin.pot\n"
+"X-Crowdin-File-ID: 538\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
diff --git a/src/po/znc.id_ID.po b/src/po/znc.id_ID.po
index db7ffca5..c007c38e 100644
--- a/src/po/znc.id_ID.po
+++ b/src/po/znc.id_ID.po
@@ -6,8 +6,13 @@ msgstr ""
 "X-Crowdin-Project: znc-bouncer\n"
 "X-Crowdin-Project-ID: 289533\n"
 "X-Crowdin-Language: id\n"
+<<<<<<< HEAD
 "X-Crowdin-File: /master/src/po/znc.pot\n"
 "X-Crowdin-File-ID: 146\n"
+=======
+"X-Crowdin-File: /1.9.x/src/po/znc.pot\n"
+"X-Crowdin-File-ID: 420\n"
+>>>>>>> 1.9.x
 "Project-Id-Version: znc-bouncer\n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"