git-merge-helper by raven1997s — theskillcity