Fixes merge

src/Umbraco.Core/Models/Template.cs

@@ -195,7 +195,7 @@ namespace Umbraco.Core.Models
 
         public void SetMasterTemplate(ITemplate masterTemplate)
         {
-            MasterTemplateId = new Lazy<int>(() => {return masterTemplate.Id});
+            MasterTemplateId = new Lazy<int>(() => masterTemplate.Id);
         }
     }
-}
+}