Merge branch 'aqualls-update-links' into 'master'

Update redirect file to correct location

See merge request gitlab-org/gitlab!73558

doc/user/project/index.md

@@ -47,7 +47,7 @@ Projects include the following [features](https://about.gitlab.com/features/):
   strategy and get reviewed by your team.
   - [Merge Request Approvals](merge_requests/approvals/index.md): Ask for approval before
   implementing a change.
-  - [Fix merge conflicts from the UI](merge_requests/resolve_conflicts.md): View Git diffs from the GitLab UI.
+  - [Fix merge conflicts from the UI](merge_requests/conflicts.md): View Git diffs from the GitLab UI.
   - [Review Apps](../../ci/review_apps/index.md): By branch, preview the results
   of the changes proposed in a merge request.
 - [Labels](labels.md): Organize issues and merge requests by labels.

doc/user/project/merge_requests/resolve_conflicts.md

@@ -3,7 +3,7 @@ redirect_to: 'conflicts.md'
 remove_date: '2022-01-26'
 ---
 
-This document was moved to [another location](../path/to/file/index.md).
+This document was moved to [another location](conflicts.md).
 
 <!-- This redirect file can be deleted after <2022-01-26>. -->
 <!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->

doc/user/project/merge_requests/reviews/index.md

@@ -211,7 +211,7 @@ These features are associated with merge requests:
   When viewing the commit details page, GitLab links to the merge request(s) containing that commit.
 - [Merge requests versions](../versions.md):
   Select and compare the different versions of merge request diffs
-- [Resolve conflicts](../resolve_conflicts.md):
+- [Resolve conflicts](../conflicts.md):
   GitLab can provide the option to resolve certain merge request conflicts in the GitLab UI.
 - [Revert changes](../revert_changes.md):
   Revert changes from any commit from a merge request.