Watch out: there is a conflict here.
The code ignores those lines, so the file will work. But it is best to fix the conflict.