re-commit Gemfile.lock after accidentally adding conflicts.