Resolve routes conflict