master merge of all the things