Fixed .gitignore merge issue.