Fix hostgroup after rebase