Your changes can't be uploaded because they conflict with changes made by someone else. Open the file to resolve these conflicts. ...