Well, yes, they conflict.  The change is simple enough, though.  I leave it to you to merge @ccaviness 's changes and mine while you land them.