v1.6.19 no conflicts II