[avodonosov]

Yes, I am skeptical about automatic conflict resolution too. But the project is interesting and uses many right concepts.