#5622 #5630
resolved conflict in .suo