name change
added my name
resolve KK conflict
resolving conflicts