issues while resolving conflicts
Merge branch 'master' of https://github.com/algosystech/collosys