errata for defeb8c
remove spurious merge marker in errata