Typography - fix merges