11.txt changed in J2
conflict solved