[Documentation:TAGrading] Update version conflict documentation (#623)

**What is the current behavior?**
Documentation for resolving a version conflict did not include recent
updates.

**What is the new behavior?**
Documentation is now updated to recent commits and notes on how to
remove version conflicts manually is removed due to it not being
relevant.

**Screenshots**
![Image 7-23-24 at 3
24 PM](https://github.com/user-attachments/assets/66ca4be7-05d9-47c4-9b31-2f3f0371f636)
Updated screenshot.

Closes #10254 (Submitty/Submitty#10254)

Author: oliiso

_docs/grader/resolving_version_conflict.md

@@ -10,13 +10,6 @@ Typically, this issue occurs when the student changes the active version after t
 
 ## Using the "Clear Version Conflicts" Button
 
-In the grading interface, there is a "Clear Version Conflicts" button that has been provided to resolve this issue. It can be found through navigating to a student gradeable that has a version conflict, opening rubric, and the button appears along the top right of the grading rubric page. If there are comments from previous versions, a red text can be seen at the header of each component within the gradeable. Once clicked, on that gradeable there is a blue button to choose to save the previous message, or a white button to discard. The message can also be updated, then saved. When the comments are all saved or discarded: click the "Clear Version Conflicts" button. A message will appear asking for confirmation, click “ok”, and the version conflict is cleared. 
+In the grading interface, there is a "Clear Version Conflicts" button that has been provided to resolve this issue. It can be found through navigating to a student gradeable that has a version conflict, opening rubric, and the button appears along the top right of the grading rubric page. If there are comments from previous versions, red text can be seen at the header of each component within the gradeable. Once clicked, on that gradeable there is a blue button to choose to save and resolve version conflicts, or a white button to discard. The message can also be updated, then saved. When the comments are all saved or discarded: click the "Clear Version Conflicts" button. A message will appear asking for confirmation, click “ok”, and the version conflict is cleared. 
 
-![](/images/ta_grading/version_conflict_button.png)
-
-
-## Resolving the Version Conflict Manually
-
-To clear this issue in the grading interface, you'll need to navigate through each rubric component labeled with a conflict. Confirm and update TA grading for the new version by interacting with each component by clicking on a rubric component (e.g., -1, -2), deselect if currently selected, save the component, and then reselect and save it again. For custom comments, ensure edits are made directly to the comment for changes to save correctly. Once all conflicts are resolved, the student can view your comments for the entire gradeable again. Alternatively, you can revert to the initially marked version of the assignment from the TA grading interface. 
-
-![](/images/ta_grading/manual_version_conflict.png)
+![](/images/ta_grading/version_conflict.png)