*.sln    text merge=union
*.csproj text merge=union
