diff --git a/app/Http/Controllers/CompanyController.php b/app/Http/Controllers/CompanyController.php
index 6e6d83b..cfac48a 100644
--- a/app/Http/Controllers/CompanyController.php
+++ b/app/Http/Controllers/CompanyController.php
@@ -31,15 +31,15 @@ class CompanyController extends Controller
         'state' => 'required',
         'country' => 'required',
         'contact_person' => 'required'
-    ];
+        ];
 
-    $validator = Validator::make($request->all(), $rules);
-    if($validator->fails()) {
-        return response()->json(['success'=> false, 'error'=> 'All the fields are required'], 400);
-        //return response()->json(['success'=> false, 'error'=> $validator->messages()], 400);
+        $validator = Validator::make($request->all(), $rules);
+        if($validator->fails()) {
+            return response()->json(['success'=> false, 'error'=> 'All the fields are required'], 400);
+            //return response()->json(['success'=> false, 'error'=> $validator->messages()], 400);
+        }
     }
 
-<<<<<<< HEAD
     public function search($company_name)
     {
         $matchedTerm = Company::where('company_name', 'LIKE','%'. $company_name . '%')->get();
@@ -54,7 +54,6 @@ class CompanyController extends Controller
     public function create()
     {
         //
-=======
        $company->company_name=$request->input('company_name');
        $company->registration_no=$request->input('registration_no');
        $company->tax_no=$request->input('tax_no');
@@ -69,7 +68,6 @@ class CompanyController extends Controller
 
        $company->save();
        return response()->json(['success'=> true, 'message'=>'Company created successfully'],200);
->>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106
     }
 
     public function companyProfile(Request $request)
diff --git a/routes/api.php b/routes/api.php
index d4991bc..2cc3387 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -25,8 +25,6 @@ use App\Company;
 Route::post('register', 'AuthController@register');
 /* Authentication */
 Route::post('login', 'AuthController@login');
-<<<<<<< HEAD
-//Route::post('recover', 'AuthController@recover');
 //
 //Route::group(['middleware' => ['jwt.auth']], function() {
 //    Route::get('logout', 'AuthController@logout');
@@ -45,12 +43,10 @@ Route :: get('/warehouse','WarehouseController@index');
 Route :: delete('/contacts/{ff_id}','ContactController@destroy');
 Route :: get('/contacts','ContactController@index');
 Route :: post('/contacts','ContactController@store');
-=======
 Route::post('password/recover', 'AuthController@recover');
 Route::post('password/reset', 'AuthController@reset');
 Route::post('send-verification', 'AuthController@sendVerification');
 Route::post('verify-phone', 'AuthController@verifyPhone');
->>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106
 
 Route::group(['middleware' => ['jwt.auth']], function() {
     Route::get('logout', 'AuthController@logout');
@@ -73,7 +69,6 @@ Route::group(['middleware' => ['jwt.auth']], function() {
     Route::post('/company/reg_cert/', 'CompanyController@regCert'); //upload registration certificaate
 });
 
-<<<<<<< HEAD
 Route::post('/company', 'CompanyController@store'); //store company information
 Route::put('/company/{company}', 'CompanyController@update'); //update company information
 Route::get('/company/search/{company_name}', 'CompanyController@search');
@@ -92,5 +87,3 @@ Route::get('/company/search/{company_name}', 'CompanyController@search');
 //     return $company;
 // });
 
-=======
->>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106