You can upload both, but you don't necessarily need to. If Content ID recognizes identical segments, they may merge into one asset, so it's really only necessary to upload the extended version since that would catch uses of the edited version as well.