Merge agents

Agent merging wheeeee :facepunch: