diff --git a/ch5/primes.cpp b/ch5/primes.cpp
index db0229d..8d4dd33 100644
--- a/ch5/primes.cpp
+++ b/ch5/primes.cpp
@@ -118,7 +118,6 @@ int main() {
   printf("\n");
 
   // second part: prime factors
-<<<<<<< HEAD
   vll r;
 
   r = primeFactors((1LL<<31)-1);                 // Mersenne prime
@@ -146,32 +145,6 @@ int main() {
   for (auto &pf : r) printf("> %lld\n", pf);     // fail to factor! (why?)
   printf("\n");
 
-  
-=======
-  vi r = primeFactors((1LL<<31)-1);              // slowest, Mersenne prime
-  for (auto &pf : r)
-    printf("> %d\n", pf);
-  r = primeFactors(136117223861LL);              // slow, large prime
-  for (auto &pf : r)
-    printf("> %d\n", pf);                        // 104729*1299709
-  r = primeFactors(142391208960LL);              // faster, large composite
-  for (auto &pf : r)
-    printf("> %d\n", pf);                        // 2^10*3^4*5*7^4*11*13
-  // r = primeFactors(99999820000081LL);            // the limit: 9999991^2
-  // for (auto &pf : r)
-  //   printf("> %d\n", pf);
-  // printf("\n");
-
-  r = primeFactors(9999973LL*9999973LL);         // 9999973^2, the limit
-  for (auto &pf : r)
-    printf("> %d\n", pf);
-  printf("\n");
-  // r = primeFactors(9999991LL*9999991LL);         // 9999991^2, first crash
-  // for (auto &pf : r)
-  //   printf("> %d\n", pf);
-  // printf("\n");
-
->>>>>>> master
   // third part: functions involving prime factors
   printf("numPF(%d) = %d\n", 60, numPF(60));   // 2^2 * 3^1 * 5^1 => 4
   printf("numDiffPF(%d) = %d\n", 60, numDiffPF(60)); // 2^2 * 3^1 * 5^1 => 3