missing a few csproj merge errors.. Now it build. (I suck at rebasing)