agent-merge-conflict-arbiter