Sorting through merge conflicts