Remove merge conflict.