Fixes for conflict