Merge conflict on StatsTest