Commit after stash/reapply
Commit after full merge with stash
Commit
Change after merge