Fix merge conflicts in routes file