resolve conflicts on RegisterPage.java