diff --git a/Pipfile b/Pipfile
index 5d7343ee..e98361c4 100644
--- a/Pipfile
+++ b/Pipfile
@@ -24,12 +24,9 @@ quart-trio = "*"
 trio = "==0.16.0"
 hypercorn = {extras = ["trio"], version = "*"}
 sqlalchemy-aio = "*"
-<<<<<<< HEAD
 embit = "*"
-=======
 pyqrcode = "*"
 pypng = "*"
->>>>>>> master
 
 [dev-packages]
 black = "==20.8b1"