mrg: fix conflict in gitignore