Resolves conflicts in Gemfile.lock file

* No files added or deleted only deleted HEAD line