Handle NaN properly for merge conflicts; add Variable.broadcast_equals