Remove stray line from manual merge

Remove stray duplicated line from manual merge.

Signed-off-by: Jeff Godin <jgodin@tadl.org>