Reconcile with master