add sell item function
fix conflict
fix bugs