I'll merge this once this file isn't in the pull request any more. Could you try deleting it, committing, and pushing again?