added new pointcloud
fixed merge conflict