fixed errors I introduced in the merge