fixed up textbox color
fix merge conflict