merge conflict URLspec