Both copies of the file have changed. To change the update action, click the file with the right mouse button. To update, ...