Stashing aws configs.
Fixing gitignore merge issue.