permit itools import without pywavelet
manually fix merge conflict