modify the front page
deal the conflict