Merge pull request #1483 from antmicro/mmcm_bit_conflict_fix

The db looks good. Merging.