add activity in inventory prompt
fix conflict