Adding ctags files
resolving merge conflicts