diff --git a/src/Controller/APIUserController.php b/src/Controller/APIUserController.php
index dd93d7b8..122d3830 100644
--- a/src/Controller/APIUserController.php
+++ b/src/Controller/APIUserController.php
@@ -162,15 +162,9 @@ class APIUserController extends Controller
             // set api user in rider
             $rider->setAPIUser($obj);
 
-<<<<<<< HEAD
             $obj->setRider($rider)
                 ->setMetadata($meta);
         }
-=======
-        // set api user in rider
-        if ($rider != null)
-            $rider->setAPIUser($obj);
->>>>>>> 7416be842559728bbb3743c0035a6d26605eb1be
 
         // set and save values
         $obj->setName($req->request->get('name'))