gitignore generated files
rearrange conditions