merge group fix and bitmap encoder