fix bugs in inventory and shop view
fix conflict