Worked on RabbitAgent.
Resolved conflict.