Fix bad merge.
Call the trash "Components" when in editing mode.