Resolve merge conflicts

Author: rmca14

articles/openshift/howto-deploy-java-jboss-enterprise-application-platform-app.md

@@ -18,11 +18,7 @@ If you're interested in providing feedback or working closely on your migration
 
 ## Prerequisites
 
-<<<<<<< HEAD
 - [!INCLUDE [quickstarts-free-trial-note](../../includes/quickstarts-free-trial-note.md)]
-=======
-- An Azure subscription. [!INCLUDE [quickstarts-free-trial-note](~/reusable-content/ce-skilling/azure/includes/quickstarts-free-trial-note.md)]
->>>>>>> 701309bb6f47ecf4331a926767cdc86cc72dbc75
 
 - A Red Hat account with complete profile. If you don't have one, you can sign up for a free developer subscription through the [Red Hat Developer Subscription for Individuals](https://developers.redhat.com/register).
 

articles/virtual-machines/workloads/oracle/weblogic-server-azure-virtual-machine.md

@@ -24,11 +24,7 @@ If you're interested in providing feedback or working closely on your migration
 
 ## Prerequisites
 
-<<<<<<< HEAD
 - [!INCLUDE [quickstarts-free-trial-note](../../../../includes/quickstarts-free-trial-note.md)]
-=======
-- An Azure subscription. [!INCLUDE [quickstarts-free-trial-note](~/reusable-content/ce-skilling/azure/includes/quickstarts-free-trial-note.md)]
->>>>>>> 701309bb6f47ecf4331a926767cdc86cc72dbc75
 
 ## Deploy WebLogic Server with Administration Server on a VM
 

articles/virtual-machines/workloads/redhat/jboss-eap-single-server-azure-vm.md

@@ -19,11 +19,7 @@ If you're interested in providing feedback or working closely on your migration
 
 ## Prerequisites
 
-<<<<<<< HEAD
 - [!INCLUDE [quickstarts-free-trial-note](../../../../includes/quickstarts-free-trial-note.md)]
-=======
-- An Azure subscription. [!INCLUDE [quickstarts-free-trial-note](~/reusable-content/ce-skilling/azure/includes/quickstarts-free-trial-note.md)]
->>>>>>> 701309bb6f47ecf4331a926767cdc86cc72dbc75
 - Install [Azure CLI](/cli/azure/install-azure-cli).
 - Install a Java Standard Edition (SE) implementation version 8 or later - for example, [Microsoft build of OpenJDK](/java/openjdk).
 - Install [Maven](https://maven.apache.org/download.cgi), version 3.5.0 or higher.