wiped gemfile.lock re-ran bundle install
cleaned merging errors