You shouldn't have had to do any merging.