Fixing csproj merge issue