Added text field
Resolved merge conflict