fix for gitignore
Merge fix