mod main.html
deal conflict