fix: deal with confict