few changes
Fix merge confilict
Add chat-v1.jade