First crack at merging contact changes