emacs: Fix conflict with Ctags
Merge pull request #333 from Haroogan/master

emacs: Fix conflict with Ctags