Update test.xml
Resolving conflicts