Resolved merge conflict in block view