Rad 3 > rad 1
Fixed conflict