fix conflict build error