Changes to File.txt
Fixed conflicts to File.txt