update git-conflict-resolve