merges conflicts