Page rebuild
remove conflict