modify conflict
add shop and brand category page
modity src/applicationContext.xml