fix resolve conflict 7