added my name at the end of the line
fixed conflict