Merge gone wrong?

[hangy]

I was just looking at this sample and it seems that a merge went wrong somewhere:

aspnet-monitoring/website/Dockerfile

Lines 2 to 17 in a7a72de

	<<<<<<< HEAD
	FROM microsoft/dotnet-framework:4.7.2-sdk AS build
	=======
	FROM microsoft/dotnet-framework:4.7.2-sdk AS builder
	>>>>>>> 0bc32715c64f97d36407ac1190b30937c09c24ed
	WORKDIR C:\src\DockerSamples.SimpleWebsite.Web
	COPY src\DockerSamples.SimpleWebsite.Web\packages.config .
	RUN nuget restore packages.config -PackagesDirectory ..\packages
	COPY src C:\src
	<<<<<<< HEAD
	RUN msbuild DockerSamples.SimpleWebsite.Web.csproj /p:OutputPath=c:\out\web\SimpleWebsite /p:Configuration=Release
	=======
	RUN msbuild DockerSamples.SimpleWebsite.Web.csproj /p:OutputPath=c:\out /p:Configuration=Release
	>>>>>>> 0bc32715c64f97d36407ac1190b30937c09c24ed