fix conflition
Merge branch 'master' of https://github.com/softdevelop/palodrive
finished Profile Review