Fix merge fail[tm].