fix register.html
fix back
fix merge