No matches were found for subject:"git merge deletes my changes"