docs - more link updates (#23612)

docs/developers-guide/build.md

@@ -62,7 +62,7 @@ If you are developing on Windows, you should run Ubuntu on Windows Subsystem for
 
 ### Developing with VS Code in a remote container
 
-Alternatively, without the need to explicitly install the above dependencies, follow the guide [on using Visual Studio Code](deven.md#developing-with-visual-studio-code.md) and its remote container support.
+Alternatively, without the need to explicitly install the above dependencies, follow the guide [on using Visual Studio Code](visual-studio-code.md) and its remote container support.
 
 ## Clone the Metabase repo
 
@@ -163,4 +163,4 @@ The entire Metabase application is compiled and assembled into a single .jar fil
 
     ./bin/build
 
-After running the build script simply look in `target/uberjar` for the output .jar file and you are ready to go.
\ No newline at end of file
+After running the build script simply look in `target/uberjar` for the output .jar file and you are ready to go.

docs/troubleshooting-guide/index.md

@@ -121,9 +121,5 @@ Metabase adds new features and squashes bugs with each release. [Upgrading to th
 [slow-dashboard]: ./my-dashboard-is-slow.html
 [sql]: ./sql.html
 [sync-fingerprint-scan]: ./sync-fingerprint-scan.html
-<<<<<<< HEAD
-[upgrade]: ../operations-guide/upgrading-metabase.html
-=======
 [timeout]: ./timeout.html
 [upgrade]: ../operations-guide/upgrading-metabase.html
->>>>>>> master