vim!
make a conflict
fix a bug
use stash