Merge hhvm