Poprawa bledow
confilct removed