There were a bunch of conflicts, but the issue seemed to be more about quantity than difficulty in resolution.
Saeed, thanks for the conflict resolution guidance it helped a lot. I always like to do the resolutions by hand so I can double check things, rather than pull a resolution from a GIT tree. However I do use those kinds of things to make sure I do the resolution correctly, so it is helpful when you provide that for me. Daniel and Alexei, there were some test case overlaps in the verifier and stuff like that. Please double check my work. As stated the net-next tree is freezing tonight, please get your changes in on time. Thanks.
