Modify some styles
Change link style
solve conflict
solve conflict