add conversation shop item
Merge origin/master