Add Dodgerobot and antigravity robot
Resolve conflict