diff --git a/.github/actions/pre-build/action.yml b/.github/actions/pre-build/action.yml
index dcd8da433..6657b4558 100644
--- a/.github/actions/pre-build/action.yml
+++ b/.github/actions/pre-build/action.yml
@@ -26,10 +26,6 @@ runs:
       run: |
         apt-get update
         apt-get install --fix-missing -y ccache sudo
-<<<<<<< HEAD
-        conda install -y conda-forge::ninja
-=======
->>>>>>> d4adb981 (Find ROOT using config mode and cmake targets)
         wget https://cernbox.cern.ch/remote.php/dav/public-files/RmnTeeOZpYjCJQb/masterkey.gsi.de.pub
         mv masterkey.gsi.de.pub /etc/cvmfs/keys
         cp .github/config/fairsoft.gsi.de.conf /etc/cvmfs/config.d
diff --git a/.github/actions/r3bbuild-steps/action.yml b/.github/actions/r3bbuild-steps/action.yml
index 72671b0aa..e53178761 100644
--- a/.github/actions/r3bbuild-steps/action.yml
+++ b/.github/actions/r3bbuild-steps/action.yml
@@ -29,11 +29,7 @@ runs:
         echo ""
         echo "path environment variable: $PATH\n"
         echo ""
-<<<<<<< HEAD
         cmake --preset ${{ matrix.preset }} . -C "$GITHUB_WORKSPACE/cmake/CI_CD/configure_options.cmake"
-=======
-        ./build.py -p -c --cmake-extra-args="-DBUILD_GEOMETRY=OFF;-C $GITHUB_WORKSPACE/cmake/CI_CD/configure_options.cmake"
->>>>>>> 3a7c47f7 (Conan package manager, build.py and Neuland calibration rewrite)
       shell: bash
 
     - name: build ${{ matrix.repos }}
diff --git a/.github/workflows/container_deploy.yml b/.github/workflows/container_deploy.yml
index f81474ae8..6d3c8cc8d 100644
--- a/.github/workflows/container_deploy.yml
+++ b/.github/workflows/container_deploy.yml
@@ -2,7 +2,7 @@ name: deploy-container
 
 on:
   push:
-    branches: [ neuland_new_calibration ]
+    # branches: [ neuland_new_calibration ]
   workflow_dispatch:
 
 
diff --git a/.github/workflows/publish_doxygen.yml b/.github/workflows/publish_doxygen.yml
index fb7378329..b054cfa90 100644
--- a/.github/workflows/publish_doxygen.yml
+++ b/.github/workflows/publish_doxygen.yml
@@ -19,7 +19,12 @@ jobs:
       - name: run doxygen
         run: |
           brew upgrade
-          brew install doxygen graphviz cmake ninja npm
+          brew install doxygen graphviz cmake ninja npm gcc
+          export PATH="/opt/homebrew/bin:$PATH"
+          echo "brew home: ${HOMEBREW_PREFIX}"
+          which gcc
+          ls ${HOMEBREW_PREFIX}/bin
+          which gfortran
           npm install mathjax@3
           cmake --workflow --preset doxygen
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2d0255c7d..8c90f59d8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,6 +32,17 @@ project(R3BROOT LANGUAGES C CXX Fortran)
 # use default gnu install convention:
 include(GNUInstallDirs)
 
+option(WITH_DOX "Generate doxygen documentation" OFF)
+option(NO_BUILD "Don't build anything except documentation" OFF)
+
+if(WITH_DOX)
+    add_subdirectory(doc)
+endif()
+
+if(NO_BUILD)
+    return()
+endif()
+
 if(NOT EXISTS "${PROJECT_SOURCE_DIR}/macros")
     message(STATUS "  ")
     message(
@@ -92,7 +103,6 @@ option(WITH_ACTAR "Build ACTAR" OFF)
 option(WITH_SOFIA "Build SOFIA" OFF)
 option(WITH_GTPC "Build GTPC" OFF)
 option(WITH_FRS "Build FRS" OFF)
-option(WITH_DOX "Generate doxygen documentation" OFF)
 option(WITH_ASYEOS "Build ASYEOS" OFF)
 option(BUILD_C3W "Build C3W" OFF)
 option(CONAN_ENABLED "conan package is enabled. (Use CMakePreset to set it)" OFF)
@@ -568,10 +578,6 @@ if(MODULE)
     add_subdirectory(${MODULE})
 endif(MODULE)
 
-if(WITH_DOX)
-    add_subdirectory(doc)
-endif()
-
 if(NOT MODULE)
     if(BUILD_GEOMETRY)
         set(ROOTSYS ${SIMPATH})
diff --git a/CMakePresets.json b/CMakePresets.json
index 1ec9cc739..0edf4f046 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -39,12 +39,9 @@
             "description": "Only build the doxygen documentation",
             "binaryDir": "${sourceDir}/build",
             "cacheVariables": {
-                "CMAKE_EXPORT_COMPILE_COMMANDS": "OFF",
-                "BUILD_GEOMETRY": "OFF",
                 "CMAKE_BUILD_TYPE": "RelWithDebInfo",
-                "CMAKE_PROJECT_TOP_LEVEL_INCLUDES": "util/cmake-conan/conan_provider.cmake",
-                "CONAN_ENABLED": "YES",
-                "WITH_DOX": "ON"
+                "WITH_DOX": "ON",
+                "NO_BUILD": "ON"
             }
         }
     ],