fix merge conflict in routes file