fix merge confilct
Merge branch 'alex' into akshy
democracy chat
merged master to branch
merged master
fix democracy stops