bitmerge: fix bitorder
trace: small incomplete fix