fixing what the merge broke.