Fixed up a b0rked merge