merged compassion branch