adding checked_in_time
merging