original .suo before conflict merge