added my name
resolving conflict