init.el: Improve smerge
Improve endshere snippet