add new tool request dialog.fix conflicts
fix compilation issues