Update Pit from conflicts and add diagnostic functions