Fixing .gitignore merge issues.