1 files changed, 0 insertions, 4 deletions
diff --git a/yarn.lock b/yarn.lock
index b8ebae406..9b98f194c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -46,11 +46,7 @@
 
 "@0xproject/order-watcher@^0.0.6":
   version "0.0.6"
-<<<<<<< HEAD
-  resolved "https://registry.yarnpkg.com/@0xproject/order-watcher/-/order-watcher-0.0.6.tgz#85a8fb21e5755bb555f427b12d64d10b89b332e6"
-=======
   resolved "https://registry.npmjs.org/@0xproject/order-watcher/-/order-watcher-0.0.6.tgz#85a8fb21e5755bb555f427b12d64d10b89b332e6"
->>>>>>> v2-prototype
   dependencies:
     "@0xproject/assert" "^0.2.12"
     "@0xproject/base-contract" "^0.3.4"