diff --git a/backend/controllers/CheckPriceController.php b/backend/controllers/CheckPriceController.php
index 84e7533..139ac59 100644
--- a/backend/controllers/CheckPriceController.php
+++ b/backend/controllers/CheckPriceController.php
@@ -66,11 +66,7 @@ class CheckPriceController extends BaseController
         }
 
         //$query = (new Query())->select('*')->from('{{%importer_files}}')->where(['not', ['time_end' => null]])->orderBy(['upload_time' => SORT_DESC]);
-<<<<<<< HEAD
-        $query = Importer::find()->where(['active' => true])->orderBy(['price_date_update' => SORT_DESC]);
-=======
         $query = Importers::find()->where(['active' => true])->orderBy(['price_date_update' => SORT_DESC]);
->>>>>>> ead5cb60ac983cdb680ec70731de195b537be6cd
 
         $provider = new ActiveDataProvider([
             'query' => $query,
--
libgit2 0.21.4