More auto-generated files listed
.gitignore confilct resolved