resolved merge conflicts

diff --cc Doxyfile
index eb15cd892224421a4d4f56cc6fec7f6ac35f9efb,b1e65fbac699f97bc971b77399d8bcb69ff03c19..e0b8a3fd9821d925f41d740550b552455c0c54e0
--- 1/Doxyfile
--- 2/Doxyfile
+++ b/Doxyfile
@@@ -1035,7 -1035,7 +1035,7 @@@ USE_MDFILE_AS_MAINPAGE = README.m
  # also VERBATIM_HEADERS is set to NO.
  # The default value is: NO.
  
--SOURCE_BROWSER         = NO
++SOURCE_BROWSER         = YES
  
  # Setting the INLINE_SOURCES tag to YES will include the body of functions,
  # classes and enums directly into the documentation.