diff --git a/pom.xml b/pom.xml
index 0a2da7e..4e3f844 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,13 @@
 
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>workspace-tree-widget</artifactId>
+<<<<<<< .mine
+	<version>6.25.0-SNAPSHOT</version>
+||||||| .r176880
+	<version>6.24.1-SNAPSHOT</version>
+=======
 	<version>6.24.2-SNAPSHOT</version>
+>>>>>>> .r177215
 	<name>gCube Workspace Tree Widget</name>
 	<description>
 		gCube Workspace Tree Widget is a widget to navigate and interact with gCube Workspace