recover a merged commit git

Shell
git checkout -b remerge master
git merge branch -s ours

Source

Also in Shell: