Resolved $routes confilict. This commit is functional