fix gemfile.lock conflicts