Update README.md

Author: timkpaine

README.md

@@ -2,15 +2,9 @@
 
 Python wrapping/binding for verible
 
-<<<<<<< before updating
-[![Build Status](https://github.com/dau-dev/verible-python/actions/workflows/build.yml/badge.svg?branch=main&event=push)](https://github.com/dau-dev/verible-python/actions/workflows/build.yml)
+[![Build Status](https://github.com/dau-dev/verible-python/actions/workflows/build.yaml/badge.svg?branch=main&event=push)](https://github.com/dau-dev/verible-python/actions/workflows/build.yaml)
 [![codecov](https://codecov.io/gh/dau-dev/verible-python/branch/main/graph/badge.svg)](https://codecov.io/gh/dau-dev/verible-python)
 [![License](https://img.shields.io/github/license/dau-dev/verible-python)](https://github.com/dau-dev/verible-python)
-=======
-[![Build Status](https://github.com/dau-dev/verible/actions/workflows/build.yaml/badge.svg?branch=main&event=push)](https://github.com/dau-dev/verible/actions/workflows/build.yaml)
-[![codecov](https://codecov.io/gh/dau-dev/verible/branch/main/graph/badge.svg)](https://codecov.io/gh/dau-dev/verible)
-[![License](https://img.shields.io/github/license/dau-dev/verible)](https://github.com/dau-dev/verible)
->>>>>>> after updating
 [![PyPI](https://img.shields.io/pypi/v/verible.svg)](https://pypi.python.org/pypi/verible)
 
 ## Overview
@@ -47,7 +41,6 @@ verible-cli verible-verilog-ls
 This software is licensed under the Apache 2.0 license. See the [LICENSE](LICENSE) file for details.
 
 Verible is Copyright 2019-2024 Google LLC, licensed under the Apache 2.0 license.
-=======
+
 > [!NOTE]
 > This library was generated using [copier](https://copier.readthedocs.io/en/stable/) from the [Base Python Project Template repository](https://github.com/python-project-templates/base).
->>>>>>> after updating