diff --git a/Pipfile.lock b/Pipfile.lock
index 910089f46c9883c2a41ded416095c490f32c04eb..1b53fef9b703b7c1fd744ea4b999b1f04583008c 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,8 +1,12 @@
 {
     "_meta": {
         "hash": {
+<<<<<<< HEAD
 <<<<<<< HEAD
             "sha256": "809e5e04e4d1957e08e475b75c4c425c1b63b7d1fdaee30e79b077e84e115504"
+=======
+            "sha256": "9d11130b39f605d10cd4d32c8b721e21b38cdbae4b5eaf19f794d6181184a08c"
+>>>>>>> pip
 =======
             "sha256": "9d11130b39f605d10cd4d32c8b721e21b38cdbae4b5eaf19f794d6181184a08c"
 >>>>>>> pip