merge of the current version