Local change 3 in server_file.txt
Gonflict fixed