Post about merge conflicts and xml
Add a bit of clarification
Merge pull request #103 from Haacked/csproj-merge-conflicts

Post about merge conflicts and xml