Conflict management
Merge branch 'master' of https://github.com/Daria-Sakura/Super-Med-Service