diff --git a/pom.xml b/pom.xml
index f859381..803a29b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,11 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 <modelVersion>4.0.0</modelVersion>
 <artifactId>irish-monitor-service</artifactId>
-<<<<<<< HEAD
 <version>1.0.5-BETA-SNAPSHOT</version>
-=======
-<version>1.0.5-SNAPSHOT</version>
->>>>>>> origin/master
 <packaging>war</packaging>
 <name>irish-monitor-service</name>
 <scm>