fix: require conflicts
Merge pull request #367 from duojs/fix/require-conflicts

fix: require conflicts