hot deals
resolved merge conflicts