Cleaned up merge conflicts
removed font folder; fixed merge conflicts