Fixed stupid merge that destroyed everything

see above