diff --git a/src/tools/benchmark-builder/benchmark-builder.vue b/src/tools/benchmark-builder/benchmark-builder.vue
index 94b91e0e..487a97f4 100644
--- a/src/tools/benchmark-builder/benchmark-builder.vue
+++ b/src/tools/benchmark-builder/benchmark-builder.vue
@@ -106,12 +106,4 @@ function copyAsMarkdown() {
}
-<<<<<<< HEAD
-
-=======
->>>>>>> a5d1352 (feat(new-tool): simple benchmark calculator)