Fixed a error loading the solution caused by a rebase/merge error

Fixed and issues caused by a rebase/merge which threw an error when trying to load the solution in Visual Studio.