Hamas: Mash'al, Zahhar feud 'behind us'