fix visibility due to merge conflict