diff --git a/backend/src/auth/RIGHTS.ts b/backend/src/auth/RIGHTS.ts
index 934efd866..0152e89df 100644
--- a/backend/src/auth/RIGHTS.ts
+++ b/backend/src/auth/RIGHTS.ts
@@ -32,7 +32,6 @@ export enum RIGHTS {
   UPDATE_CONTRIBUTION = 'UPDATE_CONTRIBUTION',
   LIST_CONTRIBUTION_LINKS = 'LIST_CONTRIBUTION_LINKS',
   SEARCH_ADMIN_USERS = 'SEARCH_ADMIN_USERS',
-
   // Admin
   SEARCH_USERS = 'SEARCH_USERS',
   SET_USER_ROLE = 'SET_USER_ROLE',
diff --git a/backend/src/auth/ROLES.ts b/backend/src/auth/ROLES.ts
index 87bb46bac..434dc11a4 100644
--- a/backend/src/auth/ROLES.ts
+++ b/backend/src/auth/ROLES.ts
@@ -28,11 +28,8 @@ export const ROLE_USER = new Role('user', [
   RIGHTS.LIST_CONTRIBUTIONS,
   RIGHTS.LIST_ALL_CONTRIBUTIONS,
   RIGHTS.UPDATE_CONTRIBUTION,
-<<<<<<< HEAD
   RIGHTS.SEARCH_ADMIN_USERS,
-=======
   RIGHTS.LIST_CONTRIBUTION_LINKS,
->>>>>>> master
 ])
 export const ROLE_ADMIN = new Role('admin', Object.values(RIGHTS)) // all rights
 
diff --git a/backend/src/graphql/model/AdminUser.ts b/backend/src/graphql/model/AdminUser.ts
index 8ddca69a0..92a22b7f1 100644
--- a/backend/src/graphql/model/AdminUser.ts
+++ b/backend/src/graphql/model/AdminUser.ts
@@ -1,5 +1,5 @@
-import { User } from "@entity/User"
-import { Field, Int, ObjectType } from "type-graphql"
+import { User } from '@entity/User'
+import { Field, Int, ObjectType } from 'type-graphql'
 
 @ObjectType()
 export class AdminUser {