diff --git a/.gitignore b/.gitignore
index c101ffb15..952f89623 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,3 +40,5 @@ Spigot-API
 Spigot-Server
 PaperSpigot-Server
 PaperSpigot-API
+Bukkit
+CraftBukkit
diff --git a/upstreamMerge.sh b/upstreamMerge.sh
deleted file mode 100755
index c95e357a2..000000000
--- a/upstreamMerge.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-PS1="$"
-basedir=`pwd`
-
-function update {
-    cd "$basedir/$1"
-    git fetch && git reset --hard origin/master
-    cd ../
-    git add $1
-}
-
-update Bukkit
-update CraftBukkit