(- new git) Adding a `git fix` command for conflicts