add back what the merge took