Gemfile.lock was not merged properly