Resolve a Merge Conflict

Two teammates changed config.ini in /home/student/repos/docs-site at the same time:

• on main, someone set timeout = 45 and added log_level = info
• on feature/retry-logic, someone set timeout = 90 and added cache = on

Task

Merge feature/retry-logic into main with a merge commit. When resolving the conflict:

• timeout must be 90 (the feature branch wins)
• keep both log_level = info and cache = on
• the final config.ini must not contain conflict markers

Finish the merge — no merge may be left in progress.