diff --git a/requirements-nover.txt b/requirements-nover.txt
index fe4336bd8..9b0427489 100644
--- a/requirements-nover.txt
+++ b/requirements-nover.txt
@@ -54,9 +54,5 @@ Flask-Testing
 pyjwt
 toposort
 pyjwkest
-<<<<<<< HEAD
 rfc3987
 jsonpath-rw
-=======
-jsonpath-rw
->>>>>>> upstream/master