deleted:    hmrg
	renamed:    mrg -> merge