Fixed everything that went wrong with the merge, and then some