merge rules
update version