use merge
Merge pull request #45 from Politiken/did-not-merge-properly-will-try-this

use merge