update of remake for mixing ROS distributions