Fix broken solution file after merge