add user visiblity hiding
fix merge conflicts