fix message conflicting while editing and previewing
Merge branch 'master' into prod