fix conflicts in init with dict by default param
fix conflicts in init with dict by default param

quarkslab/irma,hirokihamasaki/irma,hirokihamasaki/irma,quarkslab/irma,quarkslab/irma,hirokihamasaki/irma,hirokihamasaki/irma,quarkslab/irma,hirokihamasaki/irma