[TASK] solve conflict
[TASK] achimfritz/championship 1.0.5