fix hostnames
fix merge
fix hostnames