fix agent builder
merge