Text input
Fixed merge conflicts