fuck
fix conflict and add link css