update merged to ef6