jni
use libxdiff for merge
fixed