Close chat

Conflicted Change Part-1