diff --git a/aleksis/core/apps.py b/aleksis/core/apps.py
index fec8a1bd84d4aca2d0ccef0687fa73aff8b2fd2f..c14af908faab80f884372e60c6a7ba3ccb8378d0 100644
--- a/aleksis/core/apps.py
+++ b/aleksis/core/apps.py
@@ -138,12 +138,8 @@ class CoreConfig(AppConfig):
             # Save the associated person to pick up defaults
             user.person.save()
 
-<<<<<<< HEAD
     @classmethod
     def get_all_scopes(cls) -> dict[str, str]:
-=======
-    def get_all_scopes(self) -> dict[str, str]:
->>>>>>> 1aabacae (Allow apps to dynamically generate OAuth scopes)
         scopes = {
             "read": "Read anything the resource owner can read",
             "write": "Write anything the resource owner can write",