Nice catch, removed. The file shoulnd't be there, it was renamed to 'resolve' a conflict, this exact file with the same contents is already merged.

Did you check the whole pull request? Any other remarks?

If not, I'll merge it in since another pair of eyes have been over it.