Example where a pull or push request has a conflict and how to solve.
Example where a pull or push request has a conflict and how to solve.