After tense negotiations, Marriott signs new multiyear deal with Expedia