merge crodmob/goamz