Merge https://github.com/efabless/caravel_user_project_analog

README.md

diff --git a/README.md b/README.md
index d7d53a3..b46d4e7 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,6 @@
+<<<<<<< HEAD
+# class_d_audio_amplifier
+=======
 # Caravel Analog User
 
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![CI](https://github.com/efabless/caravel_user_project_analog/actions/workflows/user_project_ci.yml/badge.svg)](https://github.com/efabless/caravel_user_project_analog/actions/workflows/user_project_ci.yml) [![Caravan Build](https://github.com/efabless/caravel_user_project_analog/actions/workflows/caravan_build.yml/badge.svg)](https://github.com/efabless/caravel_user_project_analog/actions/workflows/caravan_build.yml)
@@ -16,3 +19,4 @@
 ---
 
 Refer to [README](docs/source/index.rst) for this sample project documentation. 
+>>>>>>> ab6ba9c30b06bc7e68d9478afca6f676c7e4c1ff