Merge trimgcat into galsimcat