fix bad merge
Merge pull request #231 from ros-simulation/fix_bad_merge_diff_drive

fix bad merge