Fix merge conflict.  Grr.