added line from .gitignore lost in merge