added dealing endpoints
resolved merge conflict
merge conflict resolved, deal and hit endpoints