added council members and committees
fixed merge conflict