Former. Pull main and merge into my branch, resolve conflicts, etc

(Yes I forgot, they have the agent resolve git conflicts!)