Fix bad merge, correct my files, oops!