diff --git a/.coveragerc b/.coveragerc
index cecfe93a..8cb3a1a2 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -2,4 +2,7 @@
 exclude_lines =
     pragma: no cover
     @abc.abstractmethod
+<<<<<<< HEAD
     pos = init_pos
+=======
+>>>>>>> 092ad40... Add pytest-cov config file