V. 2
resolved conficit data.xml