add aws config which uses 3 EC2 instances
fix rebase bug which discarded deletes