Merge.
sln file should always be manually merged.
Manually merge in the stuff that didn't come in the merge from master.