web app pom correction

Author: lingua

contrast-finder-webapp/pom.xml

@@ -96,13 +96,7 @@
         </dependency>
         <dependency>
             <groupId>org.opens</groupId>
-<<<<<<< HEAD
             <artifactId>contrast-finder-hsv</artifactId>
-            <version>0.3.2</version>
-=======
-            <artifactId>color-finder-hsv</artifactId>
-            <version>0.3.3</version>
->>>>>>> release-0.3.3
             <type>jar</type>
         </dependency>
         <dependency>