added merge_entities to scene, added polyline to shapes