updated agent set
Merge Konfliks