merge DiscoFix2