Update f1.txt

conflicting change