fix merge conflict in routes