Update processing2-emacs submodule
Add smerge support for git conflicted files (emacsen < 25)