fixed merge errors I missed before