merge
merge, chooseTimeController