diff --git a/backlib/src/main/java/net/miarma/api/backlib/middlewares/AbstractAuthGuard.java b/backlib/src/main/java/net/miarma/api/backlib/middlewares/AbstractAuthGuard.java
index 464ba47..e45bffa 100644
--- a/backlib/src/main/java/net/miarma/api/backlib/middlewares/AbstractAuthGuard.java
+++ b/backlib/src/main/java/net/miarma/api/backlib/middlewares/AbstractAuthGuard.java
@@ -49,9 +49,17 @@ public abstract class AbstractAuthGuard<U, R extends Enum<R> & IUserRole> {
         };
     }
     
+<<<<<<< HEAD
     protected boolean isRoleAllowed(R role, R... allowedRoles) {
         for (R allowed : allowedRoles) {
             if (role == allowed) return true;
+=======
+    protected R extractRoleFromEntity(U user) {
+        try {
+            return (R) user.getClass().getMethod("getRole").invoke(user);
+        } catch (Exception e) {
+            return null;
+>>>>>>> refs/remotes/origin/dev
         }
     }
 
diff --git a/microservices/core/pom.xml b/microservices/core/pom.xml
index 5f4258d..f366763 100644
--- a/microservices/core/pom.xml
+++ b/microservices/core/pom.xml
@@ -23,5 +23,5 @@
         <version>1.2.1</version>
   </dependency>
   </dependencies>
-  
 </project>
+
diff --git a/microservices/huertos/src/main/java/net/miarma/api/microservices/huertos/routing/middlewares/HuertosAuthGuard.java b/microservices/huertos/src/main/java/net/miarma/api/microservices/huertos/routing/middlewares/HuertosAuthGuard.java
index 4ce925d..cfb0213 100644
--- a/microservices/huertos/src/main/java/net/miarma/api/microservices/huertos/routing/middlewares/HuertosAuthGuard.java
+++ b/microservices/huertos/src/main/java/net/miarma/api/microservices/huertos/routing/middlewares/HuertosAuthGuard.java
@@ -41,6 +41,7 @@ public class HuertosAuthGuard extends AbstractAuthGuard<MemberEntity, HuertosUse
             if (member.getRole() == role) return true;
         }
         return false;
+<<<<<<< HEAD
     }
 
     @Override
@@ -76,5 +77,8 @@ public class HuertosAuthGuard extends AbstractAuthGuard<MemberEntity, HuertosUse
                 }
             });
         };
+=======
+>>>>>>> refs/remotes/origin/dev
     }
+
 }