Fix merge

Seems like MANIFEST.in was committed in an unmerged state