Deeply inside the GIT swamp, there is _mergemaid_ living.

A piece of a virgin, half-robust, half-flaky code.