conflict B
merge conflict resolved