Grr.  I _thought_ I resolved conflicts.