You have finished resolving your conflicting changes. Click Save and Close View to upload your changes, refresh the file, ...