Fix TXT
Fucking smartgit confilict solver!!!
a..hole