Fix leftover merge conflict bits.
Fix leftover merge conflict bits.

rusoto/rusoto,DualSpark/rust-aws,mattico/rusoto,DualSpark/rusoto,rusoto/rusoto,SecurityInsanity/rusoto,DualSpark/rust-aws,DualSpark/rusoto,mattico/rusoto,mattico/rusoto,DualSpark/rusoto,DualSpark/rust-aws,SecurityInsanity/rusoto,rusoto/rusoto