show the full name instead of last and first name
Added full name in the same line
Merged conflict