fix resolve conflict