fixed merge conflicts -- should work