Fixing a bad merge on Mvc.sln