Is this the new begining?
Fixed merged confflict in user/show