What's currently missing from the automatic conflict resolution is intelligence. The AI doing merges is the future.