promote /demote user done
Merge remote-tracking branch 'origin/master'