Merges conflicts