Stuck on exercise 6
Minor conflicts