git conflit to solve