fix resolve conflict 3