Merging
git merger