remove Gemfile.lock again
add Gemfile.lock to .gitignore