Connections and Devices should belong to a robot
Resolve merge conflicts