added some stub functions for the bit vector creation
merge fix
hopefully fixed merges
fixed merge message in n_parser
fixed merge messages