solve conflict for begin_timestamp and end_timestamp