Here is my git conflict
The conflicts are fixed