Fixed the conflict
Merge branch 'master' of https://github.com/tioguerra/pyrobosim