ctags files and paideia theme upgrades
resolving merge conflict