diff --git a/core/src/main/java/de/ids_mannheim/korap/exceptions/StatusCodes.java b/core/src/main/java/de/ids_mannheim/korap/exceptions/StatusCodes.java
index 7d4cf09..605607b 100644
--- a/core/src/main/java/de/ids_mannheim/korap/exceptions/StatusCodes.java
+++ b/core/src/main/java/de/ids_mannheim/korap/exceptions/StatusCodes.java
@@ -91,7 +91,6 @@
     public static final int GROUP_NOT_FOUND = 606;
     public static final int GROUP_DELETED = 607;
 
-
     //    public static final int ARGUMENT_VALIDATION_FAILURE = 700;
     // public static final int ARGUMENT_VALIDATION_FAILURE = 701;
 
diff --git a/full/src/main/java/de/ids_mannheim/korap/web/controller/UserGroupController.java b/full/src/main/java/de/ids_mannheim/korap/web/controller/UserGroupController.java
index 5781520..3be0fa7 100644
--- a/full/src/main/java/de/ids_mannheim/korap/web/controller/UserGroupController.java
+++ b/full/src/main/java/de/ids_mannheim/korap/web/controller/UserGroupController.java
@@ -210,8 +210,11 @@
     }
 
     /** Invites group members to join a user-group specified in the JSON object.
+<<<<<<< Upstream, based on dev
      * Only user-group admins and system admins are allowed. 
      * 
+=======
+>>>>>>> 18533fd Implemented #17 and added role removal after deleting members.
      * @param securityContext
      * @param group UserGroupJson containing groupId and usernames to be invited
      * as members