diff --git a/source/app/blueprints/rest/v2/alerts/__init__.py b/source/app/blueprints/rest/v2/alerts/__init__.py
index 133b68bfa..8f64d6225 100644
--- a/source/app/blueprints/rest/v2/alerts/__init__.py
+++ b/source/app/blueprints/rest/v2/alerts/__init__.py
@@ -29,11 +29,7 @@
 alerts_blueprint = Blueprint('alerts', __name__, url_prefix='/alerts')
 
 
-<<<<<<< HEAD
-@alerts_bp.get('')
-=======
-@alerts_blueprint.get('/filter')
->>>>>>> develop
+@alerts_blueprint.get('')
 @ac_api_requires(Permissions.alerts_read)
 def alerts_list_route() -> Response:
     """