changes
changes
conflict solved
change width in css for registeration