# Conflicts: # apps/product/controllers/detail.js # apps/product/models/detail-service.js # config/common.js