fix resolve conflict 1