Merge issue with eRobot fixed