I really like your agent-loop blog post.

How does the agent know which to keep and which to discard for a conflict? This would that it has deep contextual information about the codebase it's looking at.