Made user chat with two people work
Merge