[FIX] readme

README.md

@@ -1,27 +1,15 @@
 
-<<<<<<< before updating
-[![Runboat](https://img.shields.io/badge/runboat-Try%20me-875A7B.png)](https://runboat.odoo-community.org/builds?repo=OCA/account-analytic&target_branch=15.0)
-[![Pre-commit Status](https://github.com/OCA/account-analytic/actions/workflows/pre-commit.yml/badge.svg?branch=15.0)](https://github.com/OCA/account-analytic/actions/workflows/pre-commit.yml?query=branch%3A15.0)
-[![Build Status](https://github.com/OCA/account-analytic/actions/workflows/test.yml/badge.svg?branch=15.0)](https://github.com/OCA/account-analytic/actions/workflows/test.yml?query=branch%3A15.0)
-[![codecov](https://codecov.io/gh/OCA/account-analytic/branch/15.0/graph/badge.svg)](https://codecov.io/gh/OCA/account-analytic)
-[![Translation Status](https://translation.odoo-community.org/widgets/account-analytic-15-0/-/svg-badge.svg)](https://translation.odoo-community.org/engage/account-analytic-15-0/?utm_source=widget)
-=======
 <!-- /!\ Non OCA Context : Set here the badge of your runbot / runboat instance. -->
 [![Pre-commit Status](https://github.com/ecosoft-odoo/budgeting/actions/workflows/pre-commit.yml/badge.svg?branch=16.0)](https://github.com/ecosoft-odoo/budgeting/actions/workflows/pre-commit.yml?query=branch%3A16.0)
 [![Build Status](https://github.com/ecosoft-odoo/budgeting/actions/workflows/test.yml/badge.svg?branch=16.0)](https://github.com/ecosoft-odoo/budgeting/actions/workflows/test.yml?query=branch%3A16.0)
 [![codecov](https://codecov.io/gh/ecosoft-odoo/budgeting/branch/16.0/graph/badge.svg)](https://codecov.io/gh/ecosoft-odoo/budgeting)
 <!-- /!\ Non OCA Context : Set here the badge of your translation instance. -->
->>>>>>> after updating
 
 <!-- /!\ do not modify above this line -->
 
 # Budgeting
 
-<<<<<<< before updating
-This repository will be a module for extending the main budgeting.
-=======
 This project is the main project from a set of budget control modules. to fullfill additional needs. Having said that, following will describe the full cycle of budget control already provided by this project
->>>>>>> after updating
 
 <!-- /!\ do not modify below this line -->