resolve merge conflict

src/bulk.rs

@@ -26,12 +26,10 @@ impl ParallelBuilder {
     pub fn build(self) -> Parallel {
         let (tx, rx) = channel::unbounded();
         Parallel {
-            main_worker: Worker::new_fifo(),
-            vec: self.vec,
             to_thread: StuffThatNeedsToBeSent {
+                vec: self.vec,
                 device_num: self.device_num,
                 quality: self.quality,
-                stealers: Vec::with_capacity(usize::from(self.device_num)),
             },
             transmitter: tx,
             receiver: rx,
@@ -64,30 +62,6 @@ impl ParallelBuilder {
         }
     }
 }
-impl ParallelBuilder {
-    /// Builds a new [`Parallel`] with default or specified configuration.
-    /// # Example
-    /// This is the minimal requirements for using this method:
-    /// ```
-    /// # fn main() {
-    /// # use jippigy::Parallel;
-    /// let mut vector_of_bytes: Vec<Vec<u8>> = Vec::new();
-    /// let _build = Parallel::from_vec(vector_of_bytes).build();
-    /// # }
-    /// ```
-    pub fn build(self) -> Parallel {
-        let (tx, rx) = channel::unbounded();
-        Parallel {
-            to_thread: StuffThatNeedsToBeSent {
-                vec: self.vec,
-                device_num: self.device_num,
-                quality: self.quality,
-            },
-            transmitter: tx,
-            receiver: rx,
-        }
-    }
-}
 
 #[derive(Debug)]
 pub struct StuffThatNeedsToBeSent {