Fix build issue caused by merge errors in "DynamoUnits.csproj"
Merge branch 'ChocoButter' into Migration