Handle invalid xml files, update .gitignore
resolved conflict