continue fix

Author: v-thepet

articles/data-factory/ci-cd-github-troubleshoot-guide.md

@@ -372,9 +372,6 @@ For more help with troubleshooting, try the following resources:
 
 *  [Data Factory blog](https://techcommunity.microsoft.com/t5/azure-data-factory-blog/bg-p/AzureDataFactoryBlog)
 *  [Data Factory feature requests](/answers/topics/azure-data-factory.html)
-<<<<<<< HEAD
-*  [Azure videos](/shows/data-exposed/?products=azure&terms=data-factory)
-=======
->>>>>>> 04893cb4a0795a90dee76e382e96e606f7d51205
+- [Azure videos](/shows/data-exposed/?products=azure&terms=data-factory)
 *  [Stack overflow forum for Data Factory](https://stackoverflow.com/questions/tagged/azure-data-factory)
 *  [X information about Data Factory](https://x.com/hashtag/DataFactory)

articles/data-factory/data-flow-troubleshoot-connector-format.md

@@ -800,9 +800,6 @@ For more help with troubleshooting, see these resources:
 *  [Troubleshoot mapping data flows in Azure Data Factory](data-flow-troubleshoot-guide.md)
 *  [Data Factory blog](https://techcommunity.microsoft.com/t5/azure-data-factory-blog/bg-p/AzureDataFactoryBlog)
 *  [Data Factory feature requests](/answers/topics/azure-data-factory.html)
-<<<<<<< HEAD
-*  [Azure videos](/shows/data-exposed/?products=azure&terms=data-factory)
-=======
->>>>>>> 04893cb4a0795a90dee76e382e96e606f7d51205
+- [Azure videos](/shows/data-exposed/?products=azure&terms=data-factory)
 *  [Stack Overflow forum for Data Factory](https://stackoverflow.com/questions/tagged/azure-data-factory)
 *  [X information about Data Factory](https://x.com/hashtag/DataFactory)

articles/data-factory/pipeline-trigger-troubleshoot-guide.md

@@ -274,9 +274,6 @@ For more troubleshooting help, try these resources:
 
 *  [Azure Data Factory blog](https://techcommunity.microsoft.com/t5/azure-data-factory-blog/bg-p/AzureDataFactoryBlog)
 *  [Azure Data Factory feature requests](/answers/topics/azure-data-factory.html)
-<<<<<<< HEAD
-*  [Azure videos](/shows/data-exposed/?products=azure&terms=data-factory)
-=======
->>>>>>> 04893cb4a0795a90dee76e382e96e606f7d51205
+- [Azure videos](/shows/data-exposed/?products=azure&terms=data-factory)
 *  [Microsoft Q&A question page](/answers/topics/azure-data-factory.html)
 *  [X information about Azure Data Factory](https://x.com/hashtag/DataFactory)

articles/data-factory/security-and-access-control-troubleshoot-guide.md

@@ -258,10 +258,7 @@ For more help with troubleshooting, try the following resources:
 *  [Private Link for Data Factory](data-factory-private-link.md)
 *  [Data Factory blog](https://techcommunity.microsoft.com/t5/azure-data-factory-blog/bg-p/AzureDataFactoryBlog)
 *  [Data Factory feature requests](/answers/topics/azure-data-factory.html)
-<<<<<<< HEAD
-*  [Azure videos](/shows/data-exposed/?products=azure&terms=data-factory)
-=======
->>>>>>> 04893cb4a0795a90dee76e382e96e606f7d51205
+- [Azure videos](/shows/data-exposed/?products=azure&terms=data-factory)
 *  [Microsoft Q&A page](/answers/topics/azure-data-factory.html)
 *  [Stack overflow forum for Data Factory](https://stackoverflow.com/questions/tagged/azure-data-factory)
 *  [X information about Data Factory](https://x.com/hashtag/DataFactory)

articles/data-factory/self-hosted-integration-runtime-troubleshoot-guide.md

@@ -928,10 +928,7 @@ For more help with troubleshooting, try the following resources:
 
 *  [Data Factory blog](https://techcommunity.microsoft.com/t5/azure-data-factory-blog/bg-p/AzureDataFactoryBlog)
 *  [Data Factory feature requests](/answers/topics/azure-data-factory.html)
-<<<<<<< HEAD
-*  [Azure videos](/shows/data-exposed/?products=azure&terms=data-factory)
-=======
->>>>>>> 04893cb4a0795a90dee76e382e96e606f7d51205
+- [Azure videos](/shows/data-exposed/?products=azure&terms=data-factory)
 *  [Microsoft Q&A page](/answers/topics/azure-data-factory.html)
 *  [Stack overflow forum for Data Factory](https://stackoverflow.com/questions/tagged/azure-data-factory)
 *  [X information about Data Factory](https://x.com/hashtag/DataFactory)