conflict Solve

conflict solve