registration page style sintegrated
conflict resolved