Adding support for git merge
Removing content for ctags
Adding support to jump between syntactic errors using Ctrl+] and Ctrl+[