Hotfixed
tets1.txt conflict solved