added same flavor selections
fixed a bug that was incorrectly calculating the parametric errors on the fitted yield
trying some conflict resolution