RabbitMQ Client
fix conflict
merge