timepicker fixed
clean conflict !