CloudProvider added
conflict in gemfile removed