prepare to aws
merger git merge