removed generated CbParser.conflicts file