Clean up soft merge conflict files left around

[jhanders34]

• I have considered the risk of behavior change or other zero migration impact (https://github.com/OpenLiberty/open-liberty/wiki/Behavior-Changes).
• If this PR fixes an Issue, the description includes "Fixes #FILLMEIN" or "Resolves #FILLMEIN" (verify release bug label if applicable: https://github.com/OpenLiberty/open-liberty/wiki/Open-Liberty-Conventions).
• If this PR resolves an external Known Issue (including APARS), the description includes "Fixes #FILLMEIN" or "Resolves #FILLMEIN".

[LibbyBot]

Code analysis and actions

DO NOT DELETE THIS COMMENT.

• 6 FAT files were changed, added, or removed.

• Check that the build did not break the affected FAT suite(s).

• Please describe in a separate comment how you tested your changes.