file added to resolve the conflict

.gitignore

README.md

config/auth.toml

node_modules/@popperjs/core 2/dist/cjs/enums.js

node_modules/@popperjs/core 2/dist/cjs/enums.js.flow

node_modules/@popperjs/core 2/dist/cjs/enums.js.map

node_modules/@popperjs/core 2/dist/cjs/popper-base.js

node_modules/@popperjs/core 2/dist/cjs/popper-base.js.flow

node_modules/@popperjs/core 2/dist/cjs/popper-base.js.map

node_modules/@popperjs/core 2/dist/cjs/popper-lite.js

node_modules/@popperjs/core 2/dist/cjs/popper-lite.js.flow

node_modules/@popperjs/core 2/dist/cjs/popper-lite.js.map

node_modules/@popperjs/core 2/dist/cjs/popper.js

node_modules/@popperjs/core 2/dist/cjs/popper.js.flow

node_modules/@popperjs/core 2/dist/cjs/popper.js.map

node_modules/@popperjs/core 2/dist/umd/enums.js

node_modules/@popperjs/core 2/dist/umd/enums.js.map

node_modules/@popperjs/core 2/dist/umd/enums.min.js

node_modules/@popperjs/core 2/dist/umd/enums.min.js.flow

node_modules/@popperjs/core 2/dist/umd/enums.min.js.map