added my name
added myself
fixed conflict