diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 3da13dc77..b5bfc317a 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -4,3 +4,4 @@
 docs/ @ROCm/rocm-documentation
 *.md @ROCm/rocm-documentation
 *.rst @ROCm/rocm-documentation
+.readthedocs.yaml @ROCm/rocm-documentation
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index e61f66e98..876d89d97 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -4,8 +4,6 @@ on:
   push:
     branches: [ amd-mainline ]
     paths:
-      - 'docs/archive/docs-2.x/**'
-      - 'docs/archive/docs-1.x/**'
       - 'docs/archive/docs-2.x/**'
       - 'docs/archive/docs-1.x/**'
       - '.github/workflows/docs.yml'
@@ -41,13 +39,11 @@ jobs:
           make html	
       - name: Build 2.x docs
         run: |
-          cd docs/archive/docs-2.x
           cd docs/archive/docs-2.x
           make html
       - name: Relocate 1.x docs
         run: |
           mv docs/archive/docs-1.x/_build/html docs/archive/_build/html/1.x
-          mv docs/archive/docs-1.x/_build/html docs/archive/_build/html/1.x
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v3
         with:
diff --git a/README.md b/README.md
index ffc635bb4..921a6406f 100644
--- a/README.md
+++ b/README.md
@@ -4,17 +4,29 @@
 [![Docs](https://github.com/ROCm/rocprofiler-compute/actions/workflows/docs.yml/badge.svg)](https://rocm.github.io/rocprofiler-compute/)
 [![DOI](https://zenodo.org/badge/561919887.svg)](https://zenodo.org/badge/latestdoi/561919887)
 
+<<<<<<< HEAD
 # ROCm Compute Profiler
 
 ## General
 
 ROCm Compute Profiler, formerly known as Omniperf, is a system performance profiling tool for machine
+=======
+# Omniperf
+
+## General
+
+Omniperf is a system performance profiling tool for machine
+>>>>>>> 38bff8bc (Docs: refactor and integrate into ROCm docs portal (#362))
 learning/HPC workloads running on AMD MI GPUs. The tool presently
 targets usage on MI100, MI200, and MI300 accelerators.
 
 * For more information on available features, installation steps, and
 workload profiling and analysis, please refer to the online
+<<<<<<< HEAD
 [documentation](https://rocm.docs.amd.com/projects/rocprofiler-compute/en/latest/).
+=======
+[documentation](https://rocm.docs.amd.com/projects/omniperf/en/latest/).
+>>>>>>> 38bff8bc (Docs: refactor and integrate into ROCm docs portal (#362))
 
 * ROCm Compute Profiler is an AMD open source research project and is not supported
 as part of the ROCm software stack. We welcome contributions and