fixed merge conflicts

Author: tabacitu

src/app/Http/Controllers/Auth/RegisterController.php

@@ -2,8 +2,8 @@
 
 namespace Backpack\CRUD\app\Http\Controllers\Auth;
 
-use Illuminate\Auth\Events\Registered;
 use Backpack\CRUD\app\Library\Auth\RegistersUsers;
+use Illuminate\Auth\Events\Registered;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
 use Validator;