Reconcile Divergent Branches

Git