fix first page error
solve conflict