minor changes
fix merge conflits
bitfield manager update