Js2-mode, git-gutter, minimap + some useful functions
Fix merge hell