Changes in main chat activity
resolve merge confilct