add LSBs
fix up conflict