fix things my merge broke