diff --git a/.gitignore.orig b/.gitignore.orig
deleted file mode 100644
index cc49483..0000000
--- a/.gitignore.orig
+++ /dev/null
@@ -1,30 +0,0 @@
-# Bundler cache
-.bundle
-vendor
-Gemfile.lock
-
-# Jekyll cache
-.jekyll-cache
-.jekyll-metadata
-_site
-
-# RubyGems
-*.gem
-
-# NPM dependencies
-node_modules
-package-lock.json
-
-# IDE configurations
-.idea
-.vscode/*
-!.vscode/settings.json
-!.vscode/extensions.json
-!.vscode/tasks.json
-
-# Misc
-<<<<<<< HEAD
-=======
-_sass/dist
-assets/js/dist
->>>>>>> upstream_master