diff --git a/kie-eap-integration/kie-eap-integration-core/pom.xml b/kie-eap-integration/kie-eap-integration-core/pom.xml
index 91849553dc..a1ebe562fc 100755
--- a/kie-eap-integration/kie-eap-integration-core/pom.xml
+++ b/kie-eap-integration/kie-eap-integration-core/pom.xml
@@ -4,7 +4,7 @@
org.kie
kie-eap-integration
- 6.1.0-SNAPSHOT
+ 6.0.0-SNAPSHOT
org.kie
diff --git a/kie-eap-integration/kie-eap-integration-distributions/kie-eap-integration-bpms/pom.xml b/kie-eap-integration/kie-eap-integration-distributions/kie-eap-integration-bpms/pom.xml
index 61d1fbb4c7..cf03c8375e 100755
--- a/kie-eap-integration/kie-eap-integration-distributions/kie-eap-integration-bpms/pom.xml
+++ b/kie-eap-integration/kie-eap-integration-distributions/kie-eap-integration-bpms/pom.xml
@@ -4,7 +4,7 @@
org.kie
kie-eap-integration-distributions
- 6.1.0-SNAPSHOT
+ 6.0.0-SNAPSHOT
org.kie
diff --git a/kie-eap-integration/kie-eap-integration-distributions/kie-eap-integration-brms/pom.xml b/kie-eap-integration/kie-eap-integration-distributions/kie-eap-integration-brms/pom.xml
index 3245b8d8c1..4ab351d15f 100755
--- a/kie-eap-integration/kie-eap-integration-distributions/kie-eap-integration-brms/pom.xml
+++ b/kie-eap-integration/kie-eap-integration-distributions/kie-eap-integration-brms/pom.xml
@@ -4,7 +4,7 @@
org.kie
kie-eap-integration-distributions
- 6.1.0-SNAPSHOT
+ 6.0.0-SNAPSHOT
org.kie
diff --git a/kie-eap-integration/kie-eap-integration-distributions/pom.xml b/kie-eap-integration/kie-eap-integration-distributions/pom.xml
index be53dcfcab..b583f96bc1 100755
--- a/kie-eap-integration/kie-eap-integration-distributions/pom.xml
+++ b/kie-eap-integration/kie-eap-integration-distributions/pom.xml
@@ -4,7 +4,7 @@
org.kie
kie-eap-integration
- 6.1.0-SNAPSHOT
+ 6.0.0-SNAPSHOT
org.kie
@@ -48,7 +48,7 @@
${eap-modules.core.output.path}/eap-modules/eap-configurations/eap-6.1.1/eap-6.1.1-modules-config.properties
- eap-modules-distrbutions-${project.version}
+ eap-modules-distributions-${project.version}
diff --git a/kie-eap-integration/pom.xml b/kie-eap-integration/pom.xml
index a652f11974..3fa88009c3 100755
--- a/kie-eap-integration/pom.xml
+++ b/kie-eap-integration/pom.xml
@@ -1,20 +1,10 @@
-<<<<<<< HEAD
- 4.0.0
-
- org.kie
- kie-parent-with-dependencies
- 6.0.0-SNAPSHOT
-
-
-=======
4.0.0
->>>>>>> b1ba180... BZ-1025416: Unify BPMS and BRMS modules distributions in a single build.
org.kie
- kie-wb-distributions
- 6.1.0-SNAPSHOT
+ kie-parent-with-dependencies
+ 6.0.0-SNAPSHOT
org.kie