Merging flyouts -> master