How do I undo a git pull from another branch and resolve merge conflict?

Question

In Visual Studio 2019, I was working on my local repository branch named "feature/ABC-subpage-edits" that was pulled from the remote repository "master"