Add hotels model
Resolve merge conflicts