update committees and resolve conflicts #45

Closed tintheanh closed 4 years ago