Updated exerc_2_1
Fixed conflicts