Merge Flat-ui