poprawa bledow
repair navbar
resolve conflicts