customize devise and users
merge and resolving confilicts