Fixed conflicts for real