Expedia and Hopper Resume Hotel Supply Deal After Bitter Falling Out