patch to resolve conflict

adding patch for average X in Z decays