Changes to php files and style sheets (Sass)
resolved merge conflicts