Removed github conflict markers - reSynching MainFrame