diff --git a/source/Installation/Alternatives/macOS-Development-Setup.rst b/source/Installation/Alternatives/macOS-Development-Setup.rst
index b42c1c5bb87..edb105068af 100644
--- a/source/Installation/Alternatives/macOS-Development-Setup.rst
+++ b/source/Installation/Alternatives/macOS-Development-Setup.rst
@@ -53,9 +53,15 @@ You need the following things installed to build ROS 2:
 
    .. code-block:: bash
 
+<<<<<<< HEAD
        brew install asio assimp bison bullet cmake console_bridge cppcheck \
          cunit eigen freetype graphviz opencv openssl orocos-kdl pcre poco \
          pyqt5 python qt@5 sip spdlog tinyxml tinyxml2
+=======
+      brew install asio assimp bison bullet cmake console_bridge cppcheck \
+        cunit eigen freetype graphviz opencv openssl orocos-kdl pcre poco \
+        pyqt5 python qt@5 sip spdlog osrf/simulation/tinyxml1 tinyxml2
+>>>>>>> 7956a5e4 (macOS: use tinyxml1 formula (#4091))
 
 #.
    Setup some environment variables: