Remove merge conflict warning