Fixed the conflict with nosql2 challenge
Fixed the conflict with nosql2 challenge

bkimminich/juice-shop,bkimminich/juice-shop,bkimminich/juice-shop,bkimminich/juice-shop,bkimminich/juice-shop,bkimminich/juice-shop