update doxyconf
merge