s
trying to fix
Merge branch 'master' of https://github.com/DevYah/smartsoft-14
trying to solve another ones conflict