Merge confilct in routes