let's see if gitignore works
still fighting with conflictS