Small fix for conflict