Fixed bugs in the merging/pulling process of the robot http protocol fix by reapplying reverted pull requests manually