style new user form
fix merge conflict