Fix dangling merge conflict in packages' gitignore file.