Clean up soft merge conflict files left around#33567

jhanders34 merged 1 commit intoOpenLiberty:integrationOpenLiberty/open-liberty:integrationfrom

jhanders34:branch7jhanders34/open-liberty:branch7Copy head branch name to clipboard