Reconciling master changes with mine