Fixed merge conflicts, code to parse all code