Merge patch file into original bungeecord support patch