branch2
Merge commit '485c257'
new info
not stash