diff --git a/.busted b/.busted
index cbed8ac..b8c1e0b 100644
--- a/.busted
+++ b/.busted
@@ -1,10 +1,6 @@
 return {
   default = {
     ROOT = { "tests/spec" },
-<<<<<<< HEAD
-    pattern = "%.lua",
-=======
->>>>>>> 0a6e421 (feat(*) rewrite loop logic)
     lpath = "./?.lua;./?/?.lua;./?/init.lua",
     helper = "./tests/configure-log.lua",
     verbose = true,