Who are you?
confilct fixed
change merge
merge with no-ff
over issue on branch dev
Merge branch 'dev'
my stash