merged and compiling and along with no errors in gazebo sim