av: fix merge