Commit local prior to merge
Merge local changes