added dialogue stuff
fixed merge