merge fix for gitignore.