diff --git a/protected/humhub/modules/user/messages/ja/base.php b/protected/humhub/modules/user/messages/ja/base.php
index 34a4ba7c59..d4a3132f58 100644
--- a/protected/humhub/modules/user/messages/ja/base.php
+++ b/protected/humhub/modules/user/messages/ja/base.php
@@ -1,86 +1,33 @@
 <?php
-<<<<<<< HEAD
-return array (
-  '<strong>Security</strong> settings' => '<strong>セキュリティ</ strong>の設定',
-  'Basic Settings' => '基本設定',
-  'Change Email' => 'メールの変更',
-  'Change Password' => 'パスワードを変更する',
-  'Confirm new password' => '新しいパスワードを確認',
-  'Connect account' => 'アカウントを接続する',
-  'Connected Accounts' => '接続されたアカウント',
-  'Connected accounts' => '接続されたアカウント',
-  'Currently in use' => '現在使用中',
-  'Delete' => '削除',
-  'Delete Account' => 'アカウントを削除する',
-  'Disconnect account' => 'アカウントを切断する',
-  'E-Mail is already in use! - Try forgot password.' => '',
-  'Email' => '',
-  'General' => '',
-  'Here you can connect to external service provider for using external services like a single sign on authentication.' => '',
-  'Modules' => 'モジュール',
-  'My Account' => '',
-  'New password' => '',
-  'No users found.' => '',
-  'Notifications' => '通知',
-  'Password' => 'パスワード',
-  'Profile' => 'プロフィール',
-  'Security' => 'セキュリティ',
-  'Settings' => '設定',
-  'User' => 'ユーザー',
-  'User with the same email already exists but isn\'t linked to you. Login using your email first to link it.' => '',
-  'You\'re not registered.' => '',
-  'Your new password must not equal your current password!' => '',
-  'or' => 'または',
-);
-=======
-/**
- * Message translations.
- *
- * This file is automatically generated by 'yii message/extract' command.
- * It contains the localizable messages extracted from source code.
- * You may modify this file by translating the extracted messages.
- *
- * Each array element represents the translation (value) of a message (key).
- * If the value is empty, the message is considered as not translated.
- * Messages that no longer need translation will have their translations
- * enclosed between a pair of '@@' marks.
- *
- * Message string can be used with plural forms format. Check i18n section
- * of the guide for details.
- *
- * NOTE: this file must be saved in UTF-8 encoding.
- */
-return [
-    '<strong>Security</strong> settings' => '',
-    'Basic Settings' => '',
-    'Change Email' => '',
-    'Change Password' => '',
-    'Confirm new password' => '',
-    'Connect account' => '',
-    'Connected Accounts' => '',
-    'Connected accounts' => '',
-    'Currently in use' => '',
-    'Delete Account' => '',
-    'Disconnect account' => '',
+return array(
+    '<strong>Security</strong> settings' => '<strong>セキュリティ</ strong>の設定',
+    'Basic Settings' => '基本設定',
+    'Change Email' => 'メールの変更',
+    'Change Password' => 'パスワードを変更する',
+    'Confirm new password' => '新しいパスワードを確認',
+    'Connect account' => 'アカウントを接続する',
+    'Connected Accounts' => '接続されたアカウント',
+    'Connected accounts' => '接続されたアカウント',
+    'Currently in use' => '現在使用中',
+    'Delete' => '削除',
+    'Delete Account' => 'アカウントを削除する',
+    'Disconnect account' => 'アカウントを切断する',
     'E-Mail is already in use! - Try forgot password.' => '',
     'Email' => '',
     'General' => '',
     'Here you can connect to external service provider for using external services like a single sign on authentication.' => '',
+    'Modules' => 'モジュール',
     'My Account' => '',
     'New password' => '',
     'No users found.' => '',
-    'Profile' => '',
-    'Security' => '',
-    'User' => '',
+    'Notifications' => '通知',
+    'Password' => 'パスワード',
+    'Profile' => 'プロフィール',
+    'Security' => 'セキュリティ',
+    'Settings' => '設定',
+    'User' => 'ユーザー',
     'User with the same email already exists but isn\'t linked to you. Login using your email first to link it.' => '',
     'You\'re not registered.' => '',
     'Your new password must not equal your current password!' => '',
-    'or' => '',
-    'Delete' => '削除',
-    'Modules' => 'モジュール',
-    'Notifications' => '通知',
-    'Password' => 'パスワード',
-    'Settings' => '設定',
-    'Current Password' => '',
-];
->>>>>>> b20e583d310572aa5e328a399113ba4f664710b5
+    'or' => 'または',
+);