merge fixing
merge fixing
merge fixing
trying to fix merge
have removed the stuff that is always causing merge errors in moc_glwidget and ui_window
trying to fix merge errors