A conflict is not an error. It is Git saying: you both changed this line, please decide. Here is how to answer calmly.