merge aws
gemfile