# Conflicts:
#	core/src/main/java/com/wecloud/im/action/ConversationAction.java
#	core/src/main/java/com/wecloud/im/controller/ImConversationController.java
#	core/src/main/java/com/wecloud/im/service/ImConversationService.java
#	core/src/main/java/com/wecloud/im/service/impl/ImConversationServiceImpl.java