HQ types enum + health
merge