Ataraxy-Labs/weave

Entity-level semantic merge driver for Git. Resolves confli…