merge by hand and fix (my fail to use mergetool ..)