diff --git a/tsconfig.json b/tsconfig.json
index f8423ead9a27..da833f0dcec0 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -23,10 +23,7 @@
     "**/*.spec.ts",
     "**/__tests__",
     "**/*.test.ts",
-<<<<<<< HEAD
-    "**/FlowType*"
-=======
+    "**/FlowType*",
     "**/setup-jest.ts"
->>>>>>> test: add test for RenderNgAppService
   ]
 }