big updates in consensus file parsing
merging