Fix for conflict