merge conflict

conflict fix for https://github.com/RobotWebTools/ros3djs/pull/51