diff --git a/.drone.yml b/.drone.yml
index cf58d01..f542cf3 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -6,9 +6,6 @@ steps:
 - name: cargo test
   image: rust:latest
   commands:
-<<<<<<< HEAD
-=======
   - export DATABASE_URL=/tmp/save-sync.db
->>>>>>> dev
   - cargo build --all
   - cargo test --all
\ No newline at end of file
diff --git a/client/src/archive.rs b/client/src/archive.rs
index 699efaa..f365b91 100644
--- a/client/src/archive.rs
+++ b/client/src/archive.rs
@@ -73,21 +73,12 @@ impl Archive {
     ///
     /// # Examples
     /// ```
-<<<<<<< HEAD
-    /// # use crate::client::archive::Archive;
-    /// let mut archive = Archive::try_default().unwrap();
-    /// let game_save_path = "/home/user/Documents/generic_company/generic_game/save_folder";
-    /// match archive.track_game(game_save_path) {
-    ///     Ok(_) => println!("Save Sync is now tracking {}", game_save_path),
-    ///     Err(err) => eprintln!("Failed to track {}: {:?}", game_save_path, err)
-=======
     /// # use client::archive::Archive;
     /// let mut archive = Archive::try_default().unwrap();
     /// let save_path = "/home/user/Documents/generic_company/generic_game/save_folder";
     /// match archive.track_game(save_path) {
     ///     Ok(_) => println!("Save Sync is now tracking {}", save_path),
     ///     Err(err) => eprintln!("Failed to track {}: {:?}", save_path, err)
->>>>>>> dev
     /// };
     /// ```
     pub fn track_game<P: AsRef<Path>>(&mut self, path: P) -> Result<(), GameTrackError> {