fix visibility
Merge