fix resolve conflict 6