Fixed everything back up, after the corrupt merge.