Update: 'Almost Done Since March' Branch Conflicts With Itself

“Update from the 'almost done since March' person: I opened the branch. It had merge conflicts with itself. I closed the branch. Told standup it's almost done.”