diff --git a/src/laws.test.c b/src/laws.test.c
index 9a5371668..609b93d03 100644
--- a/src/laws.test.c
+++ b/src/laws.test.c
@@ -712,13 +712,10 @@ static void test_peasant_luck_effect(CuTest *tc) {
 
     statistic_test(tc, 100, 0, 1000, 0, 0, 0);
     statistic_test(tc, 100, 2, 1000, 0, 1, 1);
-<<<<<<< HEAD
-=======
 /*    
     statistic_test(tc, 1000, 400, 1000, 0, (int)(400 * 10 * 0.001 * .75),
         (int)(400 * 10 * 0.001 * .75));
  */
->>>>>>> master
     statistic_test(tc, 1000, 400, 1000, 0, 3, 3);
     statistic_test(tc, 1000, 1000, 2000, .5, 1, 501);