Resolve conflicts

docs/developer/code-of-conduct.md

docs/developer/developer-installation.md

docs/developer/get-source-code.md

docs/developer/including-libraries.md

docs/developer/merge-request.md

docs/developer/review-merge-request.md

docs/developer/style/cpp-modularization.md

docs/developer/style/cpp.md

docs/developer/style/python-modularization.md

docs/developer/testing.md

docs/documentation/additional-software.md

docs/documentation/analysis.md

docs/documentation/libraries.md

docs/documentation/overview.md

docs/documentation/sizing.md

docs/download/getting-started.md

docs/download/installation.md

docs/download/takeoff.md

docs/getting-started/takeoff.md

docs/index.md