Add RabbitMQ.
Resolve conflicts.