there are extra file changes here, from an accidental merge on my working copy.

src/Umbraco.Web/umbraco.presentation/umbraco/webservices/templates.asmx.cs
src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.cs
src/Umbraco.Web.UI/install/steps/Database.ascx.designer.cs
these shouldn't of been changed.