Fixed github conflict and modified Agent Class