boto in requirements
resolved merge conflict