(fix) module conflict resolved