Your conflicting changes are marked up in the file. Accept or reject them so you can upload to the server and refresh this ...