Rainbow 2.0 work

I have been busy working on personal 2.0 projects as well as a .NET 2.0 version of rainbow. I actually got a version to load but it was a mini version I got from an anon donar. I could not however, get the latest CVS rainbow to stop doing the conflict error. I can get it to pass VS 2005 but when ASP.NET gets a hold of it; it just errors. I asked Scott Guthrie from Microsoft for help and he is checking it out with a dev. Check out the screen shot. Notice the build passes at the bottom.