    fn resolve_conflicts(&self) -> Result<()> {
        // while there still are conflicts we resolve them in our favor
        loop {
            let out = self
                .executer
                .exec(&format!("git diff --name-only --diff-filter=U"))?;
            let conflicts: Vec<&str> = out.lines().collect();
            if conflicts.is_empty() {
                return Ok(());
            }

            for conflict in conflicts {
                let file = conflict.trim();
                self.executer