Fix merge fallout