Two extensions scripts for merging in Git