Better 3 way merge for git