Merge HQ version 522