edit pages by yffffff
solve conflict by yf