block visibility
resolved merge conflicts