remove conflict
Merge pull request #1 from BBC-News/remove-conflict

Remove conflict