Updated rails
Removed Gemfile.lock from git
Fixed merge conflict