text box toggle
trying to fix merge conflicts
merge