Added Dirac to AgentFactory. Bug occurs when collision with Dirac.
Fixed merge errors.