Merge branch 'main' into mw/distribute

Author: Melissa1412

.gitignore

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # dependencies
 /node_modules
 /.pnp
@@ -20,6 +19,4 @@
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
-=======
-./node_modules
->>>>>>> c02c72a4406fdddb76c2b68e8f9c578c88b07e06
+

contracts/MyERC20.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.9;
 
-import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+import "../node_modules/@openzeppelin/contracts/token/ERC20/ERC20.sol";
 
 contract MyERC20 is ERC20 {
     constructor() ERC20("MyERC20", "ME") {}