Fix merge damaged files and delete .suo file (add to ignore)