My second attempt at completing my assignment
Fixing merge conflict