b
conflict
products xml
Merge remote-tracking branch 'origin/master'