added avimerge support