Fix bad merge for rethink date.