Reconciling differences in merge