Merge new GUI