We submitted a lot of changes today, including the new Sandcastle live code editor went into master, and a ton of 3rd party stuff got deleted.
If you merge from master and get conflicts, try deleting the “Examples” folder. We removed everything in that folder, but lots of files there were generated by the previous build script, and those files can stick around and cause conflicts.
If your branch has modified versions of anything that was deleted, you may have to use “git rm -f path/file” to resolve the conflict.