cleaned up application css file and header with kat
resolved merge conflict in application.css