diff --git a/c-cpp/flake.nix b/c-cpp/flake.nix
index da2fe96..15e740a 100644
--- a/c-cpp/flake.nix
+++ b/c-cpp/flake.nix
@@ -24,19 +24,11 @@
             conan
             cppcheck
             doxygen
-<<<<<<< HEAD
-=======
-            gdb
->>>>>>> 66cbf13 (Add C/C++ development flake with some sane defaults.)
             gtest
             lcov
             vcpkg
             vcpkg-tool
-<<<<<<< HEAD
           ] ++ (if system == "aarch64-darwin" then [ ] else [ gdb ]);
-=======
-          ];
->>>>>>> 66cbf13 (Add C/C++ development flake with some sane defaults.)
         };
       });
     };