diff --git a/util/src/tc_common.cpp b/util/src/tc_common.cpp
index 02863b4f..9b1a9ce7 100644
--- a/util/src/tc_common.cpp
+++ b/util/src/tc_common.cpp
@@ -895,13 +895,8 @@ void TC_Common::ignorePipe()
 
 bool TC_Common::isPrimeNumber(size_t n)
 {
-<<<<<<< HEAD
-    size_t nn = (size_t) sqrt((double) n);
-    for (size_t i = 2; i < nn; i++)
-=======
     size_t nn = (size_t)sqrt((double)n);
     for(size_t i = 2; i <= nn;i++)
->>>>>>> fix tc_common prime judgment bug
     {
         if (n % i == 0)
         {