diff --git a/include/aidge/backend/cpu.hpp b/include/aidge/backend/cpu.hpp
index 49c50ba94c24b964aeb96a3a3dc996cc82bcf534..d4689a2865fbcabeb5d5b1ab0ed01ca0060c9dba 100644
--- a/include/aidge/backend/cpu.hpp
+++ b/include/aidge/backend/cpu.hpp
@@ -32,11 +32,7 @@
 #include "aidge/backend/cpu/operator/ResizeImpl.hpp"
 #include "aidge/backend/cpu/operator/ScalingImpl.hpp"
 #include "aidge/backend/cpu/operator/SigmoidImpl.hpp"
-<<<<<<< HEAD
-=======
-#include "aidge/backend/cpu/operator/SqrtImpl.hpp"
 #include "aidge/backend/cpu/operator/SliceImpl.hpp"
->>>>>>> 179480936392d229791336bd1fc58506a06aaf29
 #include "aidge/backend/cpu/operator/SoftmaxImpl.hpp"
 #include "aidge/backend/cpu/operator/SqrtImpl.hpp"
 #include "aidge/backend/cpu/operator/SubImpl.hpp"