completed the merge tested all the demo agents