diff --git a/test/PostgreSQL/Test.hs b/test/PostgreSQL/Test.hs
index 7200226..93d2c14 100644
--- a/test/PostgreSQL/Test.hs
+++ b/test/PostgreSQL/Test.hs
@@ -489,11 +489,7 @@ testAggregateFunctions = do
 
 testPostgresModule :: Spec
 testPostgresModule = do
-<<<<<<< HEAD
   describe "date_trunc" $ modifyMaxSuccess (`div` 10) $ do
-=======
-  describe "date_trunc" $ do
->>>>>>> master
     prop "works" $ \listOfDateParts -> run $ do
       let
         utcTimes =