diff --git a/composer.lock b/composer.lock
index 4b275ab98f..4924ac0cc4 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "b9a5b88ef89f4decd2780cc46806a12c",
+    "content-hash": "faa9802c94d954d24b8615c54361362a",
     "packages": [
         {
             "name": "composer/ca-bundle",
@@ -1938,7 +1938,6 @@
             "time": "2017-02-15T12:17:55+00:00"
         },
         {
-<<<<<<< HEAD
             "name": "wp-cli/rewrite-command",
             "version": "v1.0.0",
             "source": {
@@ -1950,7 +1949,47 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/wp-cli/rewrite-command/zipball/9b09d552c1c77cf406edecda20d93880d2bf1579",
                 "reference": "9b09d552c1c77cf406edecda20d93880d2bf1579",
-=======
+                "shasum": ""
+            },
+            "require-dev": {
+                "behat/behat": "~2.5",
+                "wp-cli/wp-cli": "*"
+            },
+            "type": "wp-cli-package",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                },
+                "commands": [
+                    "rewrite flush",
+                    "rewrite list",
+                    "rewrite structure"
+                ]
+            },
+            "autoload": {
+                "psr-4": {
+                    "": "src/"
+                },
+                "files": [
+                    "rewrite-command.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Daniel Bachhuber",
+                    "email": "daniel@runcommand.io",
+                    "homepage": "https://runcommand.io"
+                }
+            ],
+            "description": "Manage rewrite rules.",
+            "homepage": "https://github.com/wp-cli/rewrite-command",
+            "time": "2017-04-12T12:56:12+00:00"
+        },
+        {
             "name": "wp-cli/scaffold-command",
             "version": "v1.0.0",
             "source": {
@@ -1962,7 +2001,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/wp-cli/scaffold-command/zipball/c200f88fc02184f8e19d291f6246f9609315e29a",
                 "reference": "c200f88fc02184f8e19d291f6246f9609315e29a",
->>>>>>> master
                 "shasum": ""
             },
             "require-dev": {
@@ -1975,11 +2013,6 @@
                     "dev-master": "1.x-dev"
                 },
                 "commands": [
-<<<<<<< HEAD
-                    "rewrite flush",
-                    "rewrite list",
-                    "rewrite structure"
-=======
                     "scaffold",
                     "scaffold _s",
                     "scaffold child-theme",
@@ -1988,7 +2021,6 @@
                     "scaffold post-type",
                     "scaffold taxonomy",
                     "scaffold theme-tests"
->>>>>>> master
                 ]
             },
             "autoload": {
@@ -1996,11 +2028,7 @@
                     "": "src/"
                 },
                 "files": [
-<<<<<<< HEAD
-                    "rewrite-command.php"
-=======
                     "scaffold-command.php"
->>>>>>> master
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -2014,15 +2042,9 @@
                     "homepage": "https://runcommand.io"
                 }
             ],
-<<<<<<< HEAD
-            "description": "Manage rewrite rules.",
-            "homepage": "https://github.com/wp-cli/rewrite-command",
-            "time": "2017-04-12T12:56:12+00:00"
-=======
             "description": "Generate code for post types, taxonomies, plugins, child themes, etc.",
             "homepage": "https://github.com/wp-cli/scaffold-command",
             "time": "2017-04-12T13:01:58+00:00"
->>>>>>> master
         },
         {
             "name": "wp-cli/search-replace-command",