git practice exercise ( merging two branch and dealing with conflict)

Question

I have to clone this repo : https://github.com/glo2003/H21-tp1-git and integrate both branches which are :

refactor/structure and fix/ingredients