restoring lost changes: MERGE MASTER BEFORE COMMITING