trying to fix duplicate key issue
Merge branch 'master' of https://github.com/cmput291-project1/project2
i just need to merge