Fixes conflicts on doc/topics/autodevops/index.md

doc/topics/autodevops/index.md

@@ -293,11 +293,7 @@ report is created, it's uploaded as an artifact which you can later download and
 check out.
 
 In GitLab Ultimate, any security warnings are also
-<<<<<<< HEAD
 [shown in the merge request widget](../../user/project/merge_requests/sast.md).
-=======
-[shown in the merge request widget](https://docs.gitlab.com/ee//user/project/merge_requests/sast.html).
->>>>>>> upstream/master
 
 ### Auto Dependency Scanning **[ULTIMATE]**
 
@@ -310,11 +306,7 @@ report is created, it's uploaded as an artifact which you can later download and
 check out.
 
 In GitLab Ultimate, any security warnings are also
-<<<<<<< HEAD
 [shown in the merge request widget](../../user/project/merge_requests/dependency_scanning.md).
-=======
-[shown in the merge request widget](https://docs.gitlab.com/ee//user/project/merge_requests/dependency_scanning.html).
->>>>>>> upstream/master
 
 ### Auto License Management **[ULTIMATE]**
 
@@ -327,11 +319,7 @@ report is created, it's uploaded as an artifact which you can later download and
 check out.
 
 In GitLab Ultimate, any licenses are also
-<<<<<<< HEAD
 [shown in the merge request widget](../../user/project/merge_requests/license_management.md).
-=======
-[shown in the merge request widget](https://docs.gitlab.com/ee//user/project/merge_requests/license_management.html).
->>>>>>> upstream/master
 
 ### Auto Container Scanning
 
@@ -344,11 +332,7 @@ created, it's uploaded as an artifact which you can later download and
 check out.
 
 In GitLab Ultimate, any security warnings are also
-<<<<<<< HEAD
 [shown in the merge request widget](../../user/project/merge_requests/container_scanning.md).
-=======
-[shown in the merge request widget](https://docs.gitlab.com/ee//user/project/merge_requests/container_scanning.html).
->>>>>>> upstream/master
 
 ### Auto Review Apps
 
@@ -387,11 +371,7 @@ issues. Once the report is created, it's uploaded as an artifact which you can
 later download and check out.
 
 In GitLab Ultimate, any security warnings are also
-<<<<<<< HEAD
 [shown in the merge request widget](../../user/project/merge_requests/dast.md).
-=======
-[shown in the merge request widget](https://docs.gitlab.com/ee//user/project/merge_requests/dast.html).
->>>>>>> upstream/master
 
 ### Auto Browser Performance Testing **[PREMIUM]**
 
@@ -406,11 +386,7 @@ Auto Browser Performance Testing utilizes the [Sitespeed.io container](https://h
 ```
 
 In GitLab Premium, performance differences between the source
-<<<<<<< HEAD
 and target branches are [shown in the merge request widget](../../user/project/merge_requests/browser_performance_testing.md).
-=======
-and target branches are [shown in the merge request widget](https://docs.gitlab.com/ee//user/project/merge_requests/browser_performance_testing.html).
->>>>>>> upstream/master
 
 ### Auto Deploy