fixing the step to verify if dialog is installed
fixing conflicts
Conflicts:
	setup-pentest-tools