Pokemon ptt. Mintedinline. Resolve merge conflicts in sourcetree.

Rava hotels.