Nevrednsji
Fixed merge conflict