Fix merge regression