fix conflict xml