Fix merge (take 2).