fix seed file
fix fonts
fix merge conflicts