Fixing conflits