fixing bad rebase (csproj join + deleted file)