Fixed previous merge conflict

set Gemfile.lock to pre-conflict state