changed component name
resolved conflict