manual merge of generated UI into master