Fixed up level 2
Granny Factory
Merged conflict