Fix spurious merge tag

Signed-off-by: Khem Raj <raj.khem@gmail.com>