update
fix conflict in attic
fix font size