Fix: git conflict resolve and mainpage css change #199

Closed yoomin-hwang closed 2 months ago