Update test.xml
resolving conflicts