fixing all the stuff merge broke