Solve Conflict. Can send message and receive.
Please update before modifying.