Fix the errors caused by my sloppy merges