NOJIRA adding back clobbered entries during merge