Fix merge regression.