Resolving merge conflicts

1. Pull the changes from the main repo to your forked repo
2. Check for changes (VS code also provides a promt to resolve the conflict)
3. After solving the conflict, save and push the changes
4. Ask for review by reaching out on discord or twitter.

Follow the Steps below to solve your merge conflict

Clone your repository Open in VSCode & Write the below command in git bash/terminal
git remote add upstream https//:url of the twindle repo/
git fetch upstream
git rebase upstream/main
This will automatically update your repository if any new changes are made to the Twindle Repo because of the PR.

Note:- If you want to add some more information, open a new issue