merge people cms
merge users page
conflict fix
edit speaker dialog