REST HYPE
small conflict resolve