attempting to reconcile commits