OMG - hate merging the sln file