trying to make the caldendar fill in the textbox
fixed merge conflicts