diff --git a/backend/views/language/create.php b/backend/views/language/create.php
index b9d8db4..4796204 100644
--- a/backend/views/language/create.php
+++ b/backend/views/language/create.php
@@ -24,11 +24,7 @@ echo $this->render('layout');
             [
             'class' => Column::className(),
             'content' => function($model, $key, $index, $column) {
-<<<<<<< 1fd2bdb43fc5cfdcf100cac8b72e67fd81e7f0fa
-            return '<span class="f32"><span class="flag '.$model->lang_code.'"></span></span>';
-=======
-            return '<span class="f32"><span class="flag '.$model->country_code.'"></span></span>';
->>>>>>> 0e0edb85a79343e4d020ff05378179e2323b21bd
+             return '<span class="f32"><span class="flag '.$model->country_code.'"></span></span>';
             }
             ],
             'language_name',
diff --git a/backend/views/language/index.php b/backend/views/language/index.php
index 81ca45b..ad62ba2 100644
--- a/backend/views/language/index.php
+++ b/backend/views/language/index.php
@@ -24,11 +24,7 @@ echo $this->render('layout');
             [
                 'class' => Column::className(),
                 'content' => function($model, $key, $index, $column) {
-<<<<<<< 1fd2bdb43fc5cfdcf100cac8b72e67fd81e7f0fa
-                    return '<span class="f32"><span class="flag '.$model->lang_code.'"></span></span>';
-=======
                     return '<span class="f32"><span class="flag '.$model->country_code.'"></span></span>';
->>>>>>> 0e0edb85a79343e4d020ff05378179e2323b21bd
                 }
             ],
             'language_name',
--
libgit2 0.21.4