Fix a merge conflict that got through the squash in ##bf21076
Fix a merge conflict that got through the squash in ##bf21076

marksantos/simple-binary-encoding,real-logic/simple-binary-encoding,buybackoff/simple-binary-encoding,marksantos/simple-binary-encoding,real-logic/simple-binary-encoding,marksantos/simple-binary-encoding,real-logic/simple-binary-encoding,buybackoff/simple-binary-encoding,PKRoma/simple-binary-encoding,real-logic/simple-binary-encoding,PKRoma/simple-binary-encoding,real-logic/simple-binary-encoding,PKRoma/simple-binary-encoding,PKRoma/simple-binary-encoding,marksantos/simple-binary-encoding,PKRoma/simple-binary-encoding,marksantos/simple-binary-encoding,marksantos/simple-binary-encoding,real-logic/simple-binary-encoding,real-logic/simple-binary-encoding,PKRoma/simple-binary-encoding,buybackoff/simple-binary-encoding,buybackoff/simple-binary-encoding,PKRoma/simple-binary-encoding,marksantos/simple-binary-encoding,marksantos/simple-binary-encoding