Remove commit conflict marks and unnecessary whitespaces

Cleanup frmMain.cs