diff --git a/include/aidge/operator/AvgPooling.hpp b/include/aidge/operator/AvgPooling.hpp
index 367435fe7dd62a071d701ef69c36d56ce2f7a940..6022d6a2a1459bbfa1844f6c6d300ed8232abed4 100644
--- a/include/aidge/operator/AvgPooling.hpp
+++ b/include/aidge/operator/AvgPooling.hpp
@@ -290,9 +290,4 @@ extern template class Aidge::AvgPooling_Op<2>;
 extern template class Aidge::AvgPooling_Op<3>;
 extern template class Aidge::AvgPooling_Op<4>;
 
-<<<<<<< HEAD
-=======
-
->>>>>>> 9b3579590d612d89cd36f42d47bb396670ef14af
-
 #endif /* AIDGE_CORE_OPERATOR_AVGPOOLING_H_ */