Missed a git conflict.

Signed-off-by: Paul Buonopane <paul+git@earth2me.com>