If you delete lines that were added to this file by the merge process when you did a git pull, I can probably merge this pull request into my repository.