fixed default.html
fixed confict error