Categories list and customers list report xml file changed
Merge conflict resolved