Fix merge debacle.