add aws upload script
merge conflict resolution