fixed conflicts
changed thought font to helvetica