Fix bit assignment for CE_CONFLICTED