Proper merge conflict handling