update the front pages
deal the conflict