Include additional hostname
Resolce merge conflict