fix route merge conflict