Don't indent smerge-mode
Version bump