manual merge of simple -> master