This is a test branch and test commit, to screenshot a merge conflict
This is a test branch and test commit, to screenshot a merge conflict and add it to a powerpoint.
This is a test branch and test commit, to screenshot a merge conflict and add it to a powerpoint.