zZzzZ.

Delete git-merge-ours?