Fix forgotten merge conflict

hk2-testing/di-tck/pom.xml

diff --git a/hk2-testing/di-tck/pom.xml b/hk2-testing/di-tck/pom.xml
index f90ddae..11b242c 100644
--- a/hk2-testing/di-tck/pom.xml
+++ b/hk2-testing/di-tck/pom.xml
@@ -22,11 +22,7 @@
     <parent>
         <groupId>org.glassfish.hk2</groupId>
         <artifactId>hk2-testing</artifactId>
-<<<<<<< HEAD
-        <version>3.1.1</version>
-=======
-        <version>4.0.0-M3</version>
->>>>>>> refs/heads/4.0.0-M3
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>hk2-di-tck-runner</artifactId>