fixed bluetooth bug probably
fix merge conflict in inventory