update conversation
fix storage bug
Merge branch 'origin/feature-gui'