Update merge conflict section