Update of .gitignore
Merge fix