adding ctags files; adding new error view with automatic email reporting
resolving merge conflicts