diff --git a/.gitignore.orig b/.gitignore.orig
deleted file mode 100644
index cd3ebea..0000000
--- a/.gitignore.orig
+++ /dev/null
@@ -1,15 +0,0 @@
-<<<<<<< HEAD
-.travis.yml
-behat.yml.dist
-bin/
-features/
-=======
-behat.yml
->>>>>>> master
-node_modules/
-npm-debug.log
-package.json
-phpspec.yml
-spec/
-vendor/
-wp-cli-nightly.phar