Roronoa Zoro's feed

When do they make up I know there's a time skip and I know it's after season 1 but I NEED to know if their reunion is already written