GitHub repository: katrina-macadams/conflict-example-f23
Description: This repo is for demonstrating how to set solve a merge conflict.