Sage: fixing merges?