add AWS config
fix merge conflicts