Commit before a stash
After resolving merge conflict