change in new page
solve the conflict