Added RabbitMQ dependencies to Build.PL
Removed merge conflict files