Input_times

Could you please check?
This is a conflict which was not resolved.