Resolving merge conflict in routes