﻿Given the following git history and a rebase conflict, produce the correct resolution:

Branch 'main' has commits: A -> B -> C
Branch 'feature' diverged after A: A -> D -> E

Commit B modifies line 10 of config.py from 'timeout = 30' to 'timeout = 60'.
Commit C modifies line 15 of config.py from 'retries = 3' to 'retries = 5'.
Commit D modifies line 10 of config.py from 'timeout = 30' to 'timeout = 45'.
Commit E modifies line 20 of config.py from 'debug = False' to 'debug = True'.

When rebasing feature onto main (git rebase main), show: which commits conflict, the conflict markers that appear, and the correct resolution that preserves the intent of both branches. Explain the reasoning for choosing which value to keep for the conflicting line.
