Fix .gitignore after last merge.