css file text/views, index header
resolved conflicts before merge