Bad merge failure, updated ProtoGeometry dll's
Fixed merge failure with ProtoGeometry dll's