diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/delegateArticle.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/delegateArticle.jsp
index 8dde589..adcb427 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/delegateArticle.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/delegateArticle.jsp
@@ -8,7 +8,7 @@
 <script type='text/javascript' src='./dwr/util.js'></script>
 <script type='text/javascript' src='./dwr/interface/DelegateArticlesJS.js'></script>
 <script type="text/javascript">
-//<![CDATA[
+
 	var selectedArticleId;
 	var articleId;
 	var pattern;
@@ -91,17 +91,8 @@
 	
 	function removeRemote() {
 		var itemsToRemove = $('refereesList'+articleId).select('div.selected');
-<<<<<<< .mine
 		var refereesId = itemsToRemove.pluck('id');
-=======
-		var refereeId = itemsToRemove.pluck('id');
->>>>>>> .r446
-		//var articleId = $('articleId').value;
-<<<<<<< .mine
 		DelegateArticlesJS.removeReferees(refereesId, articleId, remove);
-=======
-		DelegateArticlesJS.removeReferee(refereeId, articleId, remove);
->>>>>>> .r446
 	}
 			
 	function remove() {
@@ -122,13 +113,8 @@
 	function addRemote(){
 		var itemsToAdd = $('refereesList'+articleId).select('div.selected');
 		var refereesId = itemsToAdd.pluck('id');
-		//var articleId = $('articleId').value;
-<<<<<<< .mine
 		DelegateArticlesJS.addReferees(refereesId, articleId, add());
-=======
-		DelegateArticlesJS.addReferee(refereeId, articleId, add());
 
->>>>>>> .r446
 	}
 	
 	function add() {
@@ -151,8 +137,7 @@
 		itemsToRemove.invoke('remove');
 		itemsToRemove = $('refereesList'+artId).select('div.dynamicListItem');
 		itemsToRemove.invoke('remove');
-	}
-//]]>
+	}
 </script>
 
 </head>
diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/DelegateArticleController.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/DelegateArticleController.java
index a2670d8..56a95bb 100644
--- a/YACOSWeb/src/org/yacos/web/PCmember/controller/DelegateArticleController.java
+++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/DelegateArticleController.java
@@ -145,7 +145,7 @@ public List<RefereeBean> getRefereesWithTheArticle(int articleId ){
 	public void addReferees(List<String> refereesId,int articleId){	
 		for (String  refereeId : refereesId) {
 			articleManager.delegateArticleToReferee(articleId, refereeId,memberId);
-			conferenceManager.addRole(RoleType.REFEREE, refereeId, SessionService.getInstance().getCurrentConference().getId());
+			conferenceManager.addRole(RoleType.REFEREE, refereeId, conf.getId());
 		}
 		logger.debug("add referee to article");
 	}
@@ -154,8 +154,13 @@ public List<RefereeBean> getRefereesWithTheArticle(int articleId ){
 		for (String refereeId : refereesId) {
 			articleManager.undelegateArticleToReferee(articleId, refereeId, memberId);
 			User referee = userManager.getUser(refereeId);
-			Role role = new Role(RoleType.REFEREE,referee,SessionService.getInstance().getCurrentConference());
-			conferenceManager.removeRole(role);
+			List<Role> userRoles = conferenceManager.getRoles(referee.getLogin(), conf.getId());
+			for (Role role : userRoles) {
+				if(role.getType().equals(Role.RoleType.REFEREE)){
+					conferenceManager.removeRole(role);
+				}
+			}
+			
 		}
 		logger.debug("remove members to article");