fixed details conflict
Merge branch 'master' of https://github.com/kennyszub/Chorecademy