MNT: fix against #35, merge conflict crud.