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