add gem thin
fix conflicts
[#56228024] add default host to staging and development