zZzzZ.

Delete git-merge-resolve?