[FIX] conflic routes.php
[FIX] repush routes.php