resolve agent conflict