resolve merge conflict

Author: mrbullwinkle

articles/cognitive-services/QnAMaker/includes/new-version.md

@@ -9,8 +9,4 @@ ms.date: 09/15/2021
 ---
 
 > [!NOTE]
-<<<<<<< HEAD
 > A newer version of the question and answering capability is now available as part of Azure Cognitive Service for Language. For more information see [Azure Cognitive Service for Language Documentation](../../language-service/index.yml). For question answering capabilities within the Language Service, see [question answering](../../language-service/question-answering/overview.md). For information on migrating existing knowledge bases consult the [migration guide](../../language-service/question-answering/how-to/migrate-qnamaker.md).
-=======
-> A newer version of question and answering capability is now available as part of Azure Cognitive Service for Language. For more information see [Azure Cognitive Service for Language Documentation](../../language-service/index.yml). For question answering capabilities within the Language Service, see [question answering](../../language-service/question-answering/overview.md). For information on migrating existing knowledge bases consult the [migration guide](../../language-service/question-answering/how-to/migrate-qnamaker.md).
->>>>>>> fdfe19699a50ea57d253aeeab55b7a57d716ea6c