Fix merge screwup