Sorting out merge issues