fixed conflicts

Author: gpickett

infra/main.bicep

@@ -1,5 +1,6 @@
+targetScope = 'resourceGroup'
 @description('Location for all resources.')
-param location string
+param location string = 'EastUS2' //Fixed for model availability, change back to resourceGroup().location
 
 @allowed([
   'australiaeast'
@@ -27,12 +28,12 @@ param location string
   'westus3'
 ])
 @description('Location for all Ai services resources. This location can be different from the resource group location.')
-param azureOpenAILocation string // The location used for all deployed resources.  This location must be in the same region as the resource group.
+param azureOpenAILocation string = 'eastus2' // The location used for all deployed resources.  This location must be in the same region as the resource group.
 
 @minLength(3)
 @maxLength(20)
 @description('Prefix for all resources created by this template.  This prefix will be used to create unique names for all resources.  The prefix must be unique within the resource group.')
-param prefix string
+param prefix string = take('macaeo-${uniqueString(resourceGroup().id)}', 10)
 
 @description('Tags to apply to all deployed resources')
 param tags object = {}