add merge rules
update version