Merging with Bukkit; seems to have failed