merge the stash and work area
merge the conflict recommit
merge test