modified paideia theme
fixing merge conflict in compiled css file