Merge Conflict Practice
This is what I used for practicing merge conflits and the processes used to resolve them.
Merge conflicts can create delays in development and production and should be resolved quickly.
It is best to work collaberatively and cooperatively to resolve these issues