This is the commit causing issue in the conflict branch
This is the commit causing issue in the master branch
Conflict solved
Forcing a new conflict
Forcing a new conflict in conflict
Problems solved
Correcting mistakes