# Conflicts: # css/child-theme.css # css/child-theme.min.css # css/child-theme.min.css.map # js/child-theme.min.js # package.json # style.css