Drop to http
include aws sdk
Gemfile conflict resolved
fix invalid comments
merge Gemfile