merge phops->icehunter