diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/rpc/GWTWorkspaceService.java b/src/main/java/org/gcube/portlets/user/workspace/client/rpc/GWTWorkspaceService.java
index 1824860..38741c0 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/rpc/GWTWorkspaceService.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/rpc/GWTWorkspaceService.java
@@ -28,6 +28,8 @@ import org.gcube.portlets.user.workspace.shared.WorkspaceTrashOperation;
 import org.gcube.portlets.user.workspace.shared.WorkspaceUserQuote;
 import org.gcube.portlets.user.workspace.shared.WorkspaceVersioningOperation;
 import org.gcube.portlets.user.workspace.shared.accounting.GxtAccountingField;
+import org.gcube.portlets.widgets.workspacesharingwidget.shared.InfoContactModel;
+import org.gcube.portlets.widgets.workspacesharingwidget.shared.WorkspaceACL;
 
 import com.google.gwt.user.client.rpc.RemoteService;
 import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
@@ -350,73 +352,9 @@ public interface GWTWorkspaceService extends RemoteService {
 	 */
 	public GWTWorkspaceItem getTimeSeriesById(String identifier) throws Exception;
 
+	
 	/**
-<<<<<<< .mine
-||||||| .r176880
-	 * Share folder.
-	 *
-	 * @param folder the folder
-	 * @param listContacts the list contacts
-	 * @param isNewFolder the is new folder
-	 * @param acl the acl
-	 * @return true, if successful
-	 * @throws Exception the exception
-	 */
-	boolean shareFolder(FileModel folder, List<InfoContactModel> listContacts,
-			boolean isNewFolder, WorkspaceACL acl) throws Exception;
 
-	/**
-	 * Gets the list user shared by folder shared id.
-	 *
-	 * @param itemId the item id
-	 * @return the list user shared by folder shared id
-	 * @throws Exception the exception
-	 */
-	public List<InfoContactModel> getListUserSharedByFolderSharedId(String itemId) throws Exception;
-
-	/**
-	 * Un shared folder by folder shared id.
-	 *
-	 * @param folderSharedId the folder shared id
-	 * @return true, if successful
-	 * @throws Exception the exception
-	 */
-	public boolean unSharedFolderByFolderSharedId(String folderSharedId) throws Exception;
-
-	/**
-=======
-	 * Share folder.
-	 *
-	 * @param folder the folder
-	 * @param listContacts the list contacts
-	 * @param isNewFolder the is new folder
-	 * @param acl the acl
-	 * @return true, if successful
-	 * @throws Exception the exception
-	 */
-	FileModel shareFolder(FileModel folder, List<InfoContactModel> listContacts,
-			boolean isNewFolder, WorkspaceACL acl) throws Exception;
-
-	/**
-	 * Gets the list user shared by folder shared id.
-	 *
-	 * @param itemId the item id
-	 * @return the list user shared by folder shared id
-	 * @throws Exception the exception
-	 */
-	public List<InfoContactModel> getListUserSharedByFolderSharedId(String itemId) throws Exception;
-
-	/**
-	 * Un shared folder by folder shared id.
-	 *
-	 * @param folderSharedId the folder shared id
-	 * @return true, if successful
-	 * @throws Exception the exception
-	 */
-	public boolean unSharedFolderByFolderSharedId(String folderSharedId) throws Exception;
-
-	/**
->>>>>>> .r177215
 	 * Gets the list parents by item identifier.
 	 *
 	 * @param itemIdentifier
diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/rpc/GWTWorkspaceServiceAsync.java b/src/main/java/org/gcube/portlets/user/workspace/client/rpc/GWTWorkspaceServiceAsync.java
index 09d9432..9f6c723 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/rpc/GWTWorkspaceServiceAsync.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/rpc/GWTWorkspaceServiceAsync.java
@@ -308,68 +308,9 @@ public interface GWTWorkspaceServiceAsync {
 	 */
 	void getTimeSeriesById(String identifier, AsyncCallback<GWTWorkspaceItem> callback);
 
-<<<<<<< .mine
-	/**
-||||||| .r176880
-	/**
-	 * Share folder.
-	 *
-	 * @param folder the folder
-	 * @param listContacts the list contacts
-	 * @param isNewFolder the is new folder
-	 * @param acl the acl
-	 * @param callback the callback
-	 */
-	void shareFolder(FileModel folder, List<InfoContactModel> listContacts,
-			boolean isNewFolder, WorkspaceACL acl,
-			AsyncCallback<Boolean> callback);
+	
 
 	/**
-	 * Gets the list user shared by folder shared id.
-	 *
-	 * @param itemId the item id
-	 * @param callback the callback
-	 * @return the list user shared by folder shared id
-	 */
-	void getListUserSharedByFolderSharedId(String itemId,
-			AsyncCallback<List<InfoContactModel>> callback);
-
-	/**
-	 * Un shared folder by folder shared id.
-	 *
-	 * @param folderSharedId the folder shared id
-	 * @param callback the callback
-	 */
-	void unSharedFolderByFolderSharedId(String folderSharedId,
-			AsyncCallback<Boolean> callback);
-
-	/**
-=======
-	void shareFolder(
-		FileModel folder, List<InfoContactModel> listContacts,
-		boolean isNewFolder, WorkspaceACL acl, AsyncCallback<FileModel> callback);
-
-	/**
-	 * Gets the list user shared by folder shared id.
-	 *
-	 * @param itemId the item id
-	 * @param callback the callback
-	 * @return the list user shared by folder shared id
-	 */
-	void getListUserSharedByFolderSharedId(String itemId,
-			AsyncCallback<List<InfoContactModel>> callback);
-
-	/**
-	 * Un shared folder by folder shared id.
-	 *
-	 * @param folderSharedId the folder shared id
-	 * @param callback the callback
-	 */
-	void unSharedFolderByFolderSharedId(String folderSharedId,
-			AsyncCallback<Boolean> callback);
-
-	/**
->>>>>>> .r177215
 	 * Gets the list parents by item identifier.
 	 *
 	 * @param itemIdentifier