resolve xpd.xml merge conflict