What not to do with PR's

Timeline of events leading to current PR that I can't resolve:

Creation of files in CMIP6_processing/ directory on adamkemberling/sdm_workflow branch
changes pushed, PR started, PR merged without conflicts
added changes to local branch adamkemberling/sdm_workflow, wished immediately that I hadn't merged PR
Reverted PR so I could try to tack on another commit
Had dumb idea to try and pull from the upstream before pushing last commit (for some reason thought it would close the loop and be helpful)
Pull from upstream deleted local files on adamkemberling/sdm_workflow because that PR bringing them up had been reverted
Next I then recovered my local branch to a previous commit that had my changes
Attempted new PR to bring everything into gulfofmaine/sdm_workflow as originally intended
Merge conflict I can't figure out how to resolve...

gulfofmaine / sdm_workflow