merging conflict
merging css/style.css