fix resolve conflict 8