diff --git a/public/userarea/importify/get_columnlist_from_csv.php b/public/userarea/importify/get_columnlist_from_csv.php
index 7aba858..e980dcd 100644
--- a/public/userarea/importify/get_columnlist_from_csv.php
+++ b/public/userarea/importify/get_columnlist_from_csv.php
@@ -2,13 +2,9 @@
 require '../../vendor/autoload.php';
 
 use PhpOffice\PhpSpreadsheet\IOFactory;
-<<<<<<< HEAD
+use PhpOffice\PhpSpreadsheet\Reader\IReader;
 
 if (isset($_FILES['f_csv'])) {
-=======
-use PhpOffice\PhpSpreadsheet\Reader\IReader;
-if(isset($_FILES['f_csv'])) {
->>>>>>> c3596bca871a41a49c8795397aeb357d58db7994
     $file = $_FILES['f_csv']['tmp_name'];
     $spreadsheet = IOFactory::load($file, IReader::READ_DATA_ONLY);
     $worksheet = $spreadsheet->getActiveSheet();