Cleaner conflict resolution

Fix stopinsert

(0) -1000 -300 -100 -30 -10 -2 +2 +10 +30 tip

mercurial