did some doxigen stuff
resolving merge conflicts