Gemfile.lock updated for debian system.
Resolve merge conflict in Gemfile.lock
Update Gems.