remove line from .gitignore
merge