On branch main
Your branch and 'origin/main' have diverged,
and have 2 and 3 different commits each, respectively.
  (use "git pull" if you want to integrate the remote branch with yours)

You have unmerged paths.
  (fix conflicts and run "git commit")
  (use "git merge --abort" to abort the merge)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/config/settings.py
	both modified:   src/api/routes.py

Changes to be committed:
	modified:   README.md

no changes added to commit (use "git add" and/or "git commit -a")
