added suggestion/accusation dialog box
fixed merge conflicts