merge of code