fix multi page break
resolved merge conflicts