Fixed the sln file after the bad automatic merge