rebuilding ros_code proj
fixed merge conflicts