resolve merge conflicts
remove fonts less