fatal: Need to specify how to reconcile divergent branches