Fixed Gemfile.lock conflicts