Removed extra lines from .gitignore merge.