Fix merge issus
Add .sln.ide to ignore