added my name
fixed conflict