editing discussions works
post merge
Merge branch 'wtf'