Resolve unannounced merge conflict