Added new HOSTNAME
Solved conflicts