[gnosis]

Unfortunately, it doesn't look like the stable version is capable of 3-way merges.

Glad to see they're working on implementing that feature, though.