stashing, before merge
merge successful