Fixed my bad merge

Sorry!