fix merge conflicts again.. some changes to parser as well
Final CIK list
Revert commit
revert