# Conflicts: # application/index/controller/LookShop.php
# Conflicts: # public/resource/js/getCollection.js