Sorting out merge errors