stash before merge
fixed merge