merging from stash
after merging from stash
saving my copy
publishing after merge with changes
commiting after merging Roger's changes