fix xml
try fix merge