Stub of mode for emacs
Fix merge