fixed merge regression