Martha is a genius
fixed .gitignore conflict