fix for conflict