fix resolve conflict 5