Local change server_file.txt
Conflict fixed