fix header clickable issue
resolve merge conflict in application.css.scss