modify admin page
modify conflict file