merge of develop code