Added name to line 5
Corrected conflict