update intersect
resolved merge conflict