syntax error which occured while solving conflict solved....
Merge branch 'master' of https://github.com/algosystech/collosys