fixed merge conflicts and rspec failures