Fix merge malfunction.