merged user edit erb