checking duplicate
almost there
Merge branch 'feature/check-duplicate' into develop
working on settings
good stuff
so clooooose