diff --git a/pom.xml b/pom.xml
index 0bff6044b..2bd64a6f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,11 @@
 	<name>Spring Batch</name>
 	<description>Spring Batch provides tools for enterprise batch or bulk processing. It can be used to wire up jobs, and track
 	their execution, or simply as an optimization for repetitive processing in a transactional environment. Spring Batch is part of the Spring Portfolio.</description>
+<<<<<<< HEAD
 	<version>3.0.0.BUILD-SNAPSHOT</version>
+=======
+	<version>2.2.2.RELEASE</version>
+>>>>>>> [maven-release-plugin] prepare release 2.2.2.RELEASE
 	<packaging>pom</packaging>
 	<modules>
 		<module>spring-batch-parent</module>
@@ -23,7 +27,7 @@
 		<url>http://github.com/SpringSource/spring-batch</url>
 		<connection>scm:git:git://github.com/SpringSource/spring-batch.git</connection>
 		<developerConnection>scm:git:ssh://git@github.com/SpringSource/spring-batch.git</developerConnection>
-	  <tag>HEAD</tag>
+	  <tag>2.2.2.RELEASE</tag>
   </scm>
 	<issueManagement>
 		<system>JIRA</system>
diff --git a/spring-batch-infrastructure-tests/pom.xml b/spring-batch-infrastructure-tests/pom.xml
index e49977afc..0b78ae28c 100644
--- a/spring-batch-infrastructure-tests/pom.xml
+++ b/spring-batch-infrastructure-tests/pom.xml
@@ -57,7 +57,11 @@
 		<dependency>
 			<groupId>org.springframework.batch</groupId>
 			<artifactId>spring-batch-infrastructure</artifactId>
+<<<<<<< HEAD
 			<version>3.0.0.BUILD-SNAPSHOT</version>
+=======
+			<version>2.2.2.RELEASE</version>
+>>>>>>> [maven-release-plugin] prepare release 2.2.2.RELEASE
 		</dependency>
 		<dependency>
 			<groupId>org.hsqldb</groupId>
diff --git a/spring-batch-parent/pom.xml b/spring-batch-parent/pom.xml
index 220986b98..0c1d18388 100644
--- a/spring-batch-parent/pom.xml
+++ b/spring-batch-parent/pom.xml
@@ -12,7 +12,7 @@
 		<url>http://github.com/SpringSource/spring-batch</url>
 		<connection>scm:git:git://github.com/SpringSource/spring-batch.git</connection>
 		<developerConnection>scm:git:git://github.com/SpringSource/spring-batch.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>2.2.2.RELEASE</tag>
 	</scm>
 	<licenses>
 		<license>
@@ -712,7 +712,7 @@
 				<artifactId>mockito-all</artifactId>
 				<version>1.9.5</version>
 				<scope>test</scope>
-			</dependency>			
+			</dependency>
 			<dependency>
 				 <groupId>org.springframework.data</groupId>
 				 <artifactId>spring-data-commons</artifactId>