Fix stash/merge conflict messages