[Git]Git conflict

[Git]Git conflict