diff --git a/include/aidge/graph/Node.hpp b/include/aidge/graph/Node.hpp
index 15d8aaf4e130af6875a9205857128daada375ad7..cd2ca38dfdf0f18391e239578bdad67fb61a3750 100644
--- a/include/aidge/graph/Node.hpp
+++ b/include/aidge/graph/Node.hpp
@@ -507,11 +507,7 @@ private:
    * @param outId
    * @param otherInId
    *
-<<<<<<< HEAD
-   * @note otherNode shared_ptr is passed by refenrece in order to be able to detect
-=======
    * @note otherNode shared_ptr is passed by reference in order to be able to detect
->>>>>>> 3a88aa7d (Update some log messages and fix small typo in Node.hpp)
    * possible dangling connection situations in debug using ref counting.
    */
   void addChildOp(const NodePtr& otherNode, const IOIndex_t outId,