deleted parserFileName. updated conflicts in parserFile