Hostmanager pull/23 conflict