Secure testing commits - Mar 2006 - Processing r3711 failed

The error message was:

data/CVE/list:203: expected CVE record, got:
''>>>>>>> .r3710\n''
make: *** [all] Error 1