diff --git a/pom.xml b/pom.xml
index b53defcbb..9aad04458 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,11 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.springframework.samples</groupId>
     <artifactId>spring-petclinic</artifactId>
+<<<<<<< HEAD
     <version>1.0.0-SNAPSHOT</version>
+=======
+    <version>1.0.0</version>
+>>>>>>> 01e0e14dae2ef7bb46e5b5e506c7d0f593a06725
 
     <name>petclinic</name>
     <packaging>war</packaging>
@@ -48,7 +52,7 @@
 
     <scm>
       <developerConnection>scm:git:https://github.com/liatrio/spring-petclinic/</developerConnection>
-      <tag>HEAD</tag>
+      <tag>spring-petclinic-1.0.0</tag>
   </scm>
 
     <dependencyManagement>