update add_time_layout
solve conflic