edited files in views
fixed merge conflict in custom.css.scss