$ 0 0 Merge branch 'migext' Conflicts: src/EntityFramework/Properties/Resources.cs src/EntityFramework/Properties/Resources.resx