fixed the merge i broke