removed merge issue

docs/getting_started.md

@@ -175,31 +175,6 @@ dso repro -s subfolder/my_stage/dvc.yaml
 dso repro -s -f subfolder/my_stage/dvc.yaml
 ```
 
-<<<<<<< HEAD
-## Syncing Changes with Remote
-
-To ensure your data and code are synchronized with the remote storage and repository, follow these steps:
-
-### Add a Remote Data Storage
-
-To ensure you can always revert to previous data versions, add a remote storage for your DVC-controlled data. Use the `dvc remote add` command to specify a remote directory where the version-controlled files will be stored.
-
-We recommend creating a directory in a suitable long-term storage location. Use the `-d` (default) option of `dvc remote add` to set this directory as the default remote storage:
-
-```bash
-# Create a directory for storing version-controlled files
-mkdir /long/term/storage/project1/DVC_STORAGE
-
-# Execute within the project directory to define the remote storage
-dvc remote add -d <remote_name> /long/term/storage/project1/DVC_STORAGE
-```
-
-### Track Data with DVC
-
-In your DSO project, all outputs are automatically controlled by DVC, ensuring that your data is versioned and managed efficiently. This setup helps maintain reproducibility and consistency across your analysis.
-
-When you have input data that was not generated within your pipeline, you need to add them to your DSO project. Use `dvc add` to track such files with DVC. This command creates an associated `.dvc` file and automatically appends the tracked file to `.gitignore`. The `.dvc` file acts as a placeholder for the original file and should be tracked by Git.
-=======
 ## Tracking and syncing files with DVC
 
 Code is tracked with git as with any other project, while data is tracked by `dvc` and synced with a [dvc remote](https://dvc.org/doc/user-guide/data-management/remote-storage#remote-storage). DVC stores `.dvc` or `dvc.lock` files in the git repository
@@ -217,7 +192,6 @@ In your DSO project, all outputs are automatically controlled by DVC, ensuring t
 When you have input data that was not generated within your pipeline, you need to add them to your DSO project.
 Use `dvc add` to track such files with DVC. This command creates an associated `.dvc` file and automatically appends
 the tracked file to `.gitignore`. The `.dvc` file acts as a placeholder for the original file and should be tracked by git.
->>>>>>> origin/main
 
 This command is particularly useful when data is generated outside of your DSO project but is used within your analysis, such as metadata or preprocessed data.