diff --git a/pagure/api/fork.py b/pagure/api/fork.py
index c009e8a..ad554b7 100644
--- a/pagure/api/fork.py
+++ b/pagure/api/fork.py
@@ -493,7 +493,11 @@ def api_pull_request_add_comment(
           "message": "Comment added"
         }
 
+<<<<<<< a8fb3f131e9001d3b8a7952180d3f92540aea426
     """  # noqa
+=======
+    """
+>>>>>>> Fix using get_authorized_project in api/fork
     repo = pagure.get_authorized_project(SESSION, repo, user=username, namespace=namespace)
 
     output = {}