Merge conflict in main window resolved