update conflict

app/Http/Controllers/Controller.php

@@ -11,7 +11,7 @@ class Controller extends BaseController
 {
     protected $pathImage   = "assets/image/";
     protected $pathDocument   = "assets/file/project/";
-    protected $pathTmpImport = "assets/file/import/";
+    protected $pathTmpImport   = "assets/file/tmpimport/";
     protected $pathActivityDocument = "assets/file/activity/";
     protected $listJoinAll = ['first', 'second', 'third', 'fourth', 'fifth',
     'sixth', 'seventh', 'eighth', 'ninth', 'tenth'];

routes/web.php

@@ -207,6 +207,7 @@ $router->group(['prefix'=>'api', 'middleware' => 'cors'], function () use ($rout
 		$router->put('/task/update-regular/{id}', 'ActivityController@updateRegular');
 		$router->delete('/task/{id}', 'ActivityController@delete');
 		$router->get('/task/get-update/{id}', 'ActivityController@getUpdate');
+		$router->post('/tmp-import/upload', 'ActivityController@uploadTmpImport');
 
 		$router->post('/link', 'LinkController@add');
 		$router->put('/link/{id}', 'LinkController@update');