fix commit ordering when combining events