Revert "Revert "fix merge conflict""

This reverts commit d2e35c29530d9147a181be91ed82f61a139021f5.