Conflicts: ICSharpCode.NRefactory.Tests/ICSharpCode.NRefactory.Tests.csproj ICSharpCode.NRefactory/ICSharpCode.NRefactory.csproj