fixing things that the merge broke