update file.txt
fixed conflicts
fixed conflicts yet again