fix for merge regression