resolve conflict_1