add diaglog
Updating vocab view
Updating vocab view, resolve conflicts