fix resolve conflict 2