merge with hyx ver