Try this if you don’t want any of the merges listed in git status:
git reset --merge
This resets the index and updates the files in the working tree that are different between <commit> and HEAD, but keeps those which are different between the index and working tree (i.e. which have changes which have not been added).
If a file that is different between <commit> and the index has unstaged changes — reset is aborted.
More about this – https://www.techpurohit.in/list-some-useful-git-commands & Doc link – https://git-scm.com/docs/git-reset